Merge branch 'devel'

2012-07-20 22:10:27 -04:00
parent 79c47d429c 1980c3aee1
commit b571761648
6 changed files with 270 additions and 5 deletions
--- a/overviewer_core/settingsDefinition.py
+++ b/overviewer_core/settingsDefinition.py
@@ -45,7 +45,7 @@

 from settingsValidators import *
 import util
-from observer import ProgressBarObserver, LoggingObserver
+from observer import ProgressBarObserver, LoggingObserver, JSObserver
 import platform
 import sys