Marek Kochanowicz 03980034a5 Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw ... into NonTableFields I have no idea what I'm doing Conflicts: apps/opencs/model/world/idtable.cpp apps/opencs/model/world/refidadapter.hpp apps/opencs/model/world/refidadapterimp.hpp		2014-06-17 14:21:50 +02:00
..
bsatool
esmtool
launcher
mwiniimporter
opencs	Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw	2014-06-17 14:21:50 +02:00
openmw	Merge remote-tracking branch 'filkry/bug1196jumpdialog'	2014-06-08 11:25:34 +02:00
openmw_test_suite
doc.hpp