comparison main/MainWindow.h @ 578:31940304272f with-dependencies

Merge from default branch

 class KeyReference;
 class Labeller;
 class ActivityLog;
 class QFileSystemWatcher;
 class QScrollArea;
+class VersionTester;
 
 class MainWindow : public MainWindowBase
 {
     Q_OBJECT
 

     ActivityLog             *m_activityLog;
     KeyReference            *m_keyReference;
 
     QFileSystemWatcher      *m_templateWatcher;
 
+    VersionTester           *m_versionTester;
+
     struct LayerConfiguration {
 	LayerConfiguration(LayerFactory::LayerType _layer
 			                       = LayerFactory::TimeRuler,
                            Model *_source = 0,
                            int _channel = -1) :