You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		11 years ago
..
.gitignore	Moved esmtool to apps/	15 years ago
CMakeLists.txt	We don't need Carbon on OS X anymore	12 years ago
esmtool.cpp	Merge branch 'master' into dialogue	11 years ago
labels.cpp	Dialog function 72 is not player-specific	12 years ago
labels.hpp	esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel	12 years ago
record.cpp	added missing columns to topic info table	11 years ago
record.hpp	New command line option --plain to print contents of scripts, books, dialogs.	12 years ago