Tats 559a7ebf90 Merge branch 'develop' into statesaving ...

Conflicts:
	DestinationGLCanvas.cpp
	MainWindow.cpp
	MainWindow.h
	Mapper.h
	MappingManager.cpp
	MappingManager.h
	Paint.h
	Shape.h
	SourceGLCanvas.cpp
	Util.cpp
	libremapping.pro
	main.cpp

2014-01-05 18:06:41 -05:00

2.6 KiB

Raw Blame History

View Raw