Pieter van der Kloet 7b554897e7 Merge remote-tracking branch 'upstream/master' into newlauncher ...

Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	components/esm/defs.hpp
	components/esm/loadappa.hpp
	components/esm/loadbody.hpp
	components/esm/loadclas.hpp
	components/esm/loadcrea.hpp
	components/esm/loadsndg.hpp
	components/interpreter/installopcodes.cpp

2011-04-28 22:05:53 +02:00

..

esmtool

Converted all tabs to four spaces

2011-01-05 22:18:21 +01:00

launcher

Added missing resource file

2011-04-28 21:55:10 +02:00

openmw

If there is an openmw.cfg in the current path, use it as global config

2011-04-28 21:55:08 +02:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00