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 branch 'master' into filter

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

settings

Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'

2013-07-18 13:51:24 +02:00

tools

open sub view on double click in report view

2012-12-12 22:36:20 +01:00

world

Merge branch 'master' into filter

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