Marc Zinnschlag c5ae95aedd Merge branch 'master' into c++11 ... Conflicts: apps/openmw/mwworld/store.hpp		2015-07-10 09:23:12 +02:00
..
mwbase	replaced boost::shared_ptr with std::shared_ptr	2015-07-07 20:20:08 +02:00
mwclass	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
mwdialogue	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00
mwgui	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00
mwinput	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
mwmechanics	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00
mwphysics	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
mwrender	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
mwscript	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00
mwsound	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
mwstate	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00
mwworld	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02: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	Water ripples	2015-06-16 20:36:48 +02:00
crashcatcher.cpp	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
doc.hpp	doc.hpp fix	2015-06-04 01:30:16 +02:00
engine.cpp	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
engine.hpp	replaced auto_ptr with unique_ptr	2015-07-07 22:11:07 +02:00
main.cpp	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00