Files
intelliphoto/IntelliPhoto/Painting/Image/IntelliShapedImage.cpp
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

2.0 KiB