Marc Zinnschlag b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' ... Conflicts: apps/opencs/view/world/table.cpp		2013-07-11 09:09:52 +02:00
..
doc	Merge remote-tracking branch 'graffy76/recordStatusDelegate'	2013-06-26 09:48:51 +02:00
settings	QDebug reference removal	2013-07-01 07:40:47 -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 remote-tracking branch 'graffy76/RefIdTypeDelegate'	2013-07-11 09:09:52 +02:00