creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-14 12:20:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sorry falscher Merge

Browse Source
This commit is contained in:
AshBastian
2020-01-09 01:07:25 +01:00
parent 9af9969c2f
commit 73500db171
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/IntelliPhoto.pro
View File

@@ -21,12 +21,9 @@ SOURCES += \
Image/IntelliRasterImage.cpp \
Image/IntelliShapedImage.cpp \
IntelliHelper/IntelliColorPicker.cpp \
<<<<<<< src/IntelliPhoto.pro
IntelliHelper/IntelliRenderSettings.cpp \
=======
IntelliHelper/IntelliToolsettings.cpp \
IntelliHelper/IntelliTriangulation.cpp \
>>>>>>> src/IntelliPhoto.pro
Layer/PaintingArea.cpp \
Tool/IntelliTool.cpp \
Tool/IntelliToolCircle.cpp \
@@ -44,13 +41,9 @@ HEADERS += \
Image/IntelliRasterImage.h \
Image/IntelliShapedImage.h \
IntelliHelper/IntelliColorPicker.h \
<<<<<<< src/IntelliPhoto.pro
IntelliHelper/IntelliHelper.h \
IntelliHelper/IntelliRenderSettings.h \
=======
IntelliHelper/IntelliToolsettings.h \
IntelliHelper/IntelliTriangulation.h \
>>>>>>> src/IntelliPhoto.pro
Layer/PaintingArea.h \
Tool/IntelliTool.h \
Tool/IntelliToolCircle.h \