Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-03-09 01:58:12 +00:00
commit 7c6c660c2f
26 files changed
+75 -28

No files matched your search

+1 -1
View File
@@ -26,7 +26,7 @@
#define __VIDEOSUBWINDOW_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )