Merge branch 'master' into dev_DialogWindowSelector

This commit is contained in:
jfmcarreira committed 2014-05-09 02:03:16 +01:00
commit 3b05cd35c4
5 files changed
+27 -10

No files matched your search

+3
View File
@@ -118,6 +118,9 @@ private:
UInt m_uiAveragePlayInterval;
Void loadFile( QString fileName );
Void zoomToFitAll();
//! Playing functions
Void setTimerStatus();
Void updateCurrFrameNum();