Merge branch 'master' into webview-chromium

build/files

@@ -379,6 +379,7 @@ QT_SRC=
     src/qt/msgdlg.cpp
     src/qt/nonownedwnd.cpp
     src/qt/notebook.cpp
+    src/qt/overlay.cpp
     src/qt/pen.cpp
     src/qt/popupwin.cpp
     src/qt/printdlg.cpp
@@ -454,6 +455,7 @@ BASE_CMN_SRC =
     src/common/filtfind.cpp
     src/common/fmapbase.cpp
     src/common/fs_arc.cpp
+    src/common/fs_data.cpp
     src/common/fs_filter.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
@@ -570,6 +572,7 @@ BASE_CMN_HDR =
     wx/fontenc.h
     wx/fontmap.h
     wx/fs_arc.h
+    wx/fs_data.h
     wx/fs_filter.h
     wx/fs_mem.h
     wx/fs_zip.h
@@ -1149,6 +1152,7 @@ GUI_CMN_HDR =
     wx/peninfobase.h
     wx/persist.h
     wx/persist/bookctrl.h
+    wx/persist/combobox.h
     wx/persist/dataview.h
     wx/persist/splitter.h
     wx/persist/toplevel.h