scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ...

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp

2015-03-27 17:30:48 +01:00

..

mwbase

Remove more outdated TODO comments.

2015-03-12 00:37:28 +01:00

mwclass

consolidate random number logic

2015-03-15 14:07:47 +13:00

mwdialogue

WindowManager refactoring

2015-03-11 20:04:25 +01:00

mwgui

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-03-27 17:30:48 +01:00

mwinput

Merge remote-tracking branch 'scrawl/master'

2015-03-12 10:29:39 +01:00

mwmechanics

Removed duplicated code.

2015-03-23 20:57:36 +13:00

mwrender

consolidate random number logic

2015-03-15 14:07:47 +13:00

mwscript

Merge remote-tracking branch 'scrawl/master'

2015-03-12 10:29:39 +01:00

mwsound

Merge remote-tracking branch 'dteviot/Rng'

2015-03-15 22:04:26 +01:00

mwstate

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

mwworld

consolidate random number logic

2015-03-15 14:07:47 +13:00

android_commandLine.cpp

release jni memory

2015-03-16 18:21:38 +04:00

android_commandLine.h

command line support for Android

2015-03-15 21:15:58 +04:00

android_main.c

release jni memory

2015-03-16 18:21:38 +04:00

CMakeLists.txt

command line support for Android

2015-03-15 21:15:58 +04:00

crashcatcher.cpp

make it C98 compat

2014-12-23 17:13:11 +01:00

doc.hpp

first set of additional doxygen comments

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

engine.cpp

consolidate random number logic

2015-03-15 14:07:47 +13:00

engine.hpp

Remove unused function

2015-02-05 04:18:43 +01:00

main.cpp

Fixed more MSVC 2013 warnings.

2015-03-15 08:49:03 +13:00