Merge branch 'master' into devel

This commit is contained in:
2015-03-09 01:58:12 +00:00
26 changed files with 75 additions and 28 deletions
-1
View File
@@ -22,7 +22,6 @@
* \brief Class to handle video playback
*/
#include "lib/PlaYUVerDefs.h"
#include <QtGui>
#include "PlaYUVerSubWindowHandle.h"
#include "VideoHandle.h"