Marc Zinnschlag 04b1657d98 Merge branch 'openmw-27' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/main.cpp		2013-11-30 09:45:41 +01:00
..
doc	Merge branch 'openmw-27'	2013-11-30 09:45:41 +01:00
filter
settings
tools	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
world	hid ID column in info tables (not relevant for the user)	2013-11-14 13:14:37 +01:00