Marc Zinnschlag adb05737ee Merge branch 'master' into filter ...

Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp

2013-07-30 15:55:50 +02:00

..

doc

Merge remote-tracking branch 'graffy76/recordStatusDelegate'

2013-06-26 09:48:51 +02:00

filter

basic filter table

2013-07-22 21:18:47 +02:00

settings

Fixed setting synchronization issue

2013-07-17 20:19:01 -05:00

tools

moved IdCollection base into its own source file pair and renamed it to Collection

2013-06-17 11:42:02 +02:00

world

Merge branch 'master' into filter

2013-07-30 15:55:50 +02:00