Merge branch 'master' into linux

2017-01-30 14:01:01 -05:00
parent 823e96f637 e656841b86
commit 73cfe2bd24
523 changed files with 180920 additions and 934 deletions
--- a/src/scenedit/SConscript
+++ b/src/scenedit/SConscript
@@ -10,6 +10,7 @@ scened_sources = Split("""
 	scen.keydlgs.cpp
 	scen.main.cpp
 	scen.townout.cpp
+	../tools/view_dialogs.cpp
 """)

 if str(platform) == "darwin":