Merge branch 'dev' into dev_PolygonTool

This commit is contained in:
2019-12-19 11:31:34 +01:00
12 changed files with 179 additions and 56 deletions

View File

@@ -29,7 +29,7 @@ SOURCES += \
Tool/IntelliToolPen.cpp \
Tool/IntelliToolPlain.cpp \
Tool/IntelliToolPolygon.cpp \
Tool/IntelliToolRechteck.cpp \
Tool/IntelliToolRectangle.cpp \
main.cpp
HEADERS += \
@@ -46,7 +46,7 @@ HEADERS += \
Tool/IntelliToolPen.h \
Tool/IntelliToolPlain.h \
Tool/IntelliToolPolygon.h \
Tool/IntelliToolRechteck.h
Tool/IntelliToolRectangle.h
FORMS += \
mainwindow.ui