Commit bfb3406d authored 12 years ago by Andreas Schenk

Merge remote-tracking branch 'origin/develop' into data_viewer

Conflicts:
	modules/gui/src/data_viewer/data_viewer.cc
	modules/gui/src/data_viewer/data_viewer.hh
	modules/gui/src/file_loader.cc
	modules/gui/src/gosty_app.hh
	modules/gui/src/scene_selection.cc

parents bcdc7720 efe32730

Branches data_viewer

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 739 additions and 545 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment