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	Moved esmtool to apps/	2010-07-21 13:52:28 +02:00
CMakeLists.txt	We don't need Carbon on OS X anymore	2013-06-15 14:47:33 +04:00
esmtool.cpp	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
labels.cpp	Dialog function 72 is not player-specific	2013-08-08 06:02:16 -07:00
labels.hpp	esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel	2013-02-16 14:48:44 +01:00
record.cpp	added missing columns to topic info table	2013-11-05 11:41:48 +01:00
record.hpp	New command line option --plain to print contents of scripts, books, dialogs.	2013-05-22 20:09:11 +02:00