scrawl f2c3616638 Merge branch 'next' into terrain_next ...

Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake

2012-02-28 21:49:45 +01:00

..

mangle @ f3c9694bf2

mangle update (music workaround)

2012-02-26 10:23:34 +01:00

openengine @ 21b8456453

submodule update (uncommon crash fix)

2012-02-24 08:56:27 +01:00

platform

Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.

2011-01-10 13:48:16 -07:00