Marc Zinnschlag a445683312 Merge branch 'mergetool' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/tools/tools.cpp		2015-09-11 13:22:15 +02:00
..
birthsigncheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
birthsigncheck.hpp
bodypartcheck.cpp
bodypartcheck.hpp
classcheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
classcheck.hpp
factioncheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
factioncheck.hpp
magiceffectcheck.cpp
magiceffectcheck.hpp
mandatoryid.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
mandatoryid.hpp
mergeoperation.cpp	merge land tables	2015-09-03 16:15:00 +02:00
mergeoperation.hpp	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00
mergestages.cpp	fixed an indexing error	2015-09-11 10:50:19 +02:00
mergestages.hpp	merge land tables	2015-09-03 16:15:00 +02:00
mergestate.hpp	merge land texture tables	2015-08-30 14:27:22 +02:00
pathgridcheck.cpp
pathgridcheck.hpp
racecheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
racecheck.hpp
referenceablecheck.cpp
referenceablecheck.hpp
referencecheck.cpp
referencecheck.hpp
regioncheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
regioncheck.hpp
reportmodel.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
reportmodel.hpp
scriptcheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
scriptcheck.hpp
search.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
search.hpp
searchoperation.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
searchoperation.hpp
searchstage.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
searchstage.hpp
skillcheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
skillcheck.hpp
soundcheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
soundcheck.hpp
soundgencheck.cpp
soundgencheck.hpp
spellcheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
spellcheck.hpp
startscriptcheck.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
startscriptcheck.hpp
tools.cpp	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
tools.hpp	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00