Resolved conflict

This commit is contained in:
Tats
2015-09-17 09:12:43 -04:00
parent a236cf1a22
commit f3c199b3ce
+1
View File
@@ -72,6 +72,7 @@ QMAKE_EXTRA_TARGETS += docs
unix:!mac {
DEFINES += UNIX
CONFIG += link_pkgconfig
INCLUDE_PATH +=
PKGCONFIG += \
gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 \
liblo \