Jonas Mucke edd1f9f861 Merge branch 'Dev' into 'MuckeMachtSachen' ...

# Conflicts:
#   IntelliPhoto/Painting/GUI/IntelliPhotoGui.h
#   IntelliPhoto/Painting/Image/IntelliShapedImage.cpp
#   IntelliPhoto/Painting/IntelliPhoto.pro.user
#   IntelliPhoto/Painting/Layer/PaintingArea.cpp
#   IntelliPhoto/Painting/Layer/PaintingArea.h

2019-12-05 13:47:52 +00:00

..

GUI

Merge branch 'Dev' into 'MuckeMachtSachen'

2019-12-05 13:47:52 +00:00

Image

Merge branch 'Dev' into 'MuckeMachtSachen'

2019-12-05 13:47:52 +00:00

IntelliHelper

Image structure

2019-11-28 16:34:26 +01:00

Layer

Merge branch 'Dev' into 'MuckeMachtSachen'

2019-12-05 13:47:52 +00:00

icon.ico

Merge branch 'Dev' of https://gitlab.com/creyd/intelliphoto into Dev

2019-11-25 13:34:23 +01:00

IntelliPhoto.87de10b

just naming changes

2019-11-22 06:22:13 +01:00

IntelliPhoto.pro

Image structure

2019-11-28 16:34:26 +01:00

IntelliPhoto.pro.user

right saving

2019-12-05 14:44:00 +01:00

IntelliPhoto.pro.user.87de10b

Implemented LAyer structure

2019-12-05 14:18:42 +01:00

IntelliPhoto.pro.user.426164d

Ich hab mal kurz nen exporter geschriebn und seb ist nen nab

2019-12-05 14:00:20 +01:00

IntelliPhoto.user

Merge branch 'Dev' of https://gitlab.com/creyd/intelliphoto into Dev

2019-11-25 13:34:23 +01:00

main.cpp

Image structure

2019-11-28 16:34:26 +01:00

Scribble.pro.user.426164d

Merge branch 'Dev' of https://gitlab.com/creyd/intelliphoto into Dev

2019-11-25 13:34:23 +01:00

widget.ui

just naming changes

2019-11-22 06:22:13 +01:00