Merge branch 'spike-qgraphicsview-zoom-and-scroll' into spike-qgraphicsview-zoom-and-scroll-merge-develop

Browse Source

Conflicts:
	DestinationGLCanvas.cpp
	DestinationGLCanvas.h
	MainWindow.cpp
	MainWindow.h
	MapperGLCanvas.cpp
	MapperGLCanvas.h

...

This commit is contained in:

Tats

2015-07-06 20:38:51 -06:00

parent dc1d144cf1 b6b3863eb2

commit 7e85ab493c

27 changed files with 1569 additions and 925 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Mapper.cpp

+735 -328

File diff suppressed because it is too large Load Diff