Marc Zinnschlag d1d861e1be Merge branch 'run' ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/CMakeLists.txt		2014-09-14 11:59:54 +02:00
..
doc	Merge branch 'run'	2014-09-14 11:59:54 +02:00
filter	removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)	2014-08-10 21:03:45 +02:00
settings	removed a redundant (and unsufficiently configured) copy of ConfigurationManager	2014-05-10 17:46:10 +02:00
tools	Merge branch 'run'	2014-09-14 11:59:54 +02:00
world	Merge branch 'run'	2014-09-14 11:59:54 +02:00