Marc Zinnschlag c5ae95aedd Merge branch 'master' into c++11 ... Conflicts: apps/openmw/mwworld/store.hpp		2015-07-10 09:23:12 +02:00
..
myguidatamanager.cpp	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
myguidatamanager.hpp
myguiloglistener.cpp
myguiloglistener.hpp	Physics stub in preparation for rewrite	2015-05-10 00:28:51 +02:00
myguiplatform.cpp
myguiplatform.hpp	Implement UI scaling factor	2015-05-15 00:41:21 +02:00
myguirendermanager.cpp	Merge branch 'master' into c++11	2015-07-10 09:23:12 +02:00
myguirendermanager.hpp	Implement UI scaling factor	2015-05-15 00:41:21 +02:00
myguitexture.cpp	replaced NULL with nullptr	2015-07-07 22:46:15 +02:00
myguitexture.hpp	Improve MyGUI texture updates	2015-05-14 01:26:10 +02:00