Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp		2013-11-10 13:21:39 +01:00
..
.gitignore
CMakeLists.txt
esmtool.cpp	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
labels.cpp
labels.hpp
record.cpp	added missing columns to topic info table	2013-11-05 11:41:48 +01:00
record.hpp