creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-06-13 05:12:24 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
54e1f890030ac2b219de52cc6b8233234b48651e
intelliphoto/IntelliPhoto/Painting/Image
History
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
..
IntelliImage.cpp
Restore of old painting
2019-12-04 18:07:54 +01:00
IntelliImage.h
Restore of old painting
2019-12-04 18:07:54 +01:00
IntelliRasterImage.cpp
Restore of old painting
2019-12-04 18:07:54 +01:00
IntelliRasterImage.h
Restore of old painting
2019-12-04 18:07:54 +01:00
IntelliShapedImage.cpp
Merge branch 'Dev' into 'MuckeMachtSachen'
2019-12-05 13:47:52 +00:00
IntelliShapedImage.h
Restore of old painting
2019-12-04 18:07:54 +01:00