Merge branch 'master' into travis

This commit is contained in:
Simon Detheridge
2015-05-30 10:17:09 +01:00
11 changed files with 327 additions and 213 deletions

View File

@ -73,7 +73,8 @@ HEADERS += \
../../../Source/EmberCommon/EmberCommon.h \
../../../Source/EmberCommon/JpegUtils.h \
../../../Source/EmberCommon/EmberCommonPch.h \
../../../Source/Fractorium/FractoriumCommon.h
../../../Source/Fractorium/FractoriumCommon.h \
../../../Source/Fractorium/DoubleSpinBoxTableItemDelegate.h
FORMS += \
../../../Source/Fractorium/AboutDialog.ui \