merge branch developer into gappixels, added .project into gitignore

This commit is contained in:
maliakal_d 2017-10-12 15:08:32 +02:00
commit 0fe43c75f2

View File

@ -3,3 +3,4 @@ forms/include/
mocs/
objs/
qrc_icons.cpp
.project