Marc Zinnschlag a445683312 Merge branch 'mergetool' ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp

2015-09-11 13:22:15 +02:00

..

doc

Merge branch 'mergetool'

2015-09-11 13:22:15 +02:00

filter

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

settings

Update to upstream/master. Resolve merge conflicts

2015-07-27 13:54:13 +03:00

tools

Merge branch 'mergetool'

2015-09-11 13:22:15 +02:00

world

Merge branch 'mergetool'

2015-09-11 13:22:15 +02:00