Files
mapmap/ShapeGraphicsItem.cpp
Tats 1146a6408e Merge branch 'develop' into feature/qt-properties
# Conflicts:
#	Mapping.h
#	OscInterface.cpp
#	ProjectReader.cpp
#	ProjectWriter.cpp
#	Shape.h
#	main.cpp
2016-02-15 13:16:04 -05:00

20 KiB