Merge branch 'master' into travis

This commit is contained in:
Simon Detheridge
2015-06-30 14:46:13 +01:00
10 changed files with 329 additions and 329 deletions

View File

@ -9,7 +9,7 @@ include(../shared_settings.pri)
QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_CXXFLAGS += -BUILDING_EMBERCL
QMAKE_CXXFLAGS += -BUILDING_EMBER
SOURCES += \
../../../Source/Ember/Affine2D.cpp \