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

..

doc

Merge branch 'refs'

2014-05-30 10:38:38 +02:00

filter

Various fixes for CppCheck warnings.

2013-12-06 07:36:16 +01:00

settings

removed a redundant (and unsufficiently configured) copy of ConfigurationManager

2014-05-10 17:46:10 +02:00

tools

silenced two warnings

2014-05-30 10:18:05 +02:00

world

Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw

2014-06-17 14:21:50 +02:00