Resolve conflicts with master

This commit is contained in:
2015-04-18 16:14:00 -07:00

View File

@@ -1,3 +1,5 @@
!contains(CONFIG,c++11):CONFIG += C++11
HEADERS += \
$$PWD/include/boo.hpp \
$$PWD/include/IContext.hpp \
@@ -13,12 +15,6 @@ mac:HEADERS += \
win32:HEADERS += \
$$PWD/include/CWGLContext.hpp \
SOURCES += \
$$PWD/src/CSurface.cpp \
$$PWD/src/CCGLContext.cpp \
$$PWD/src/CRetraceWaiter.cpp
unix:SOURCES += \
$$PWD/src/CGLXContext.cpp \