Merge branch 'master' into travis

This commit is contained in:
Simon Detheridge
2015-06-04 17:24:42 +01:00
25 changed files with 352 additions and 74 deletions

View File

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