creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-14 20:30:32 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
6aab6e4a34fe50ca0c791780d328d51df9609a39
intelliphoto/IntelliPhoto/Painting/Layer/PaintingArea.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

7.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink