mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 05:46:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into travis

Browse Source
This commit is contained in:
Simon Detheridge
2015-07-24 13:05:31 +01:00
parent 63f52759ea e16c6a825f
commit e81dfc3000
25 changed files with 668 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Builds/QtCreator/Fractorium/Fractorium.pro
View File

@ -47,6 +47,7 @@ SOURCES += \
../../../Source/Fractorium/GLWidget.cpp \
../../../Source/Fractorium/Main.cpp \
../../../Source/Fractorium/OptionsDialog.cpp \
../../../Source/Fractorium/VariationsDialog.cpp \
../../../Source/Fractorium/SpinBox.cpp
HEADERS += \
@ -75,12 +76,14 @@ HEADERS += \
../../../Source/EmberCommon/EmberCommonPch.h \
../../../Source/Fractorium/FractoriumCommon.h \
../../../Source/Fractorium/DoubleSpinBoxTableItemDelegate.h \
../../../Source/Fractorium/PaletteTableWidgetItem.h
../../../Source/Fractorium/PaletteTableWidgetItem.h \
../../../Source/Fractorium/VariationsDialog.h
FORMS += \
../../../Source/Fractorium/AboutDialog.ui \
../../../Source/Fractorium/FinalRenderDialog.ui \
../../../Source/Fractorium/Fractorium.ui \
../../../Source/Fractorium/VariationsDialog.ui \
../../../Source/Fractorium/OptionsDialog.ui
OTHER_FILES += \