1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 12:39:53 +00:00
scrawl 2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
2012-09-15 00:57:29 +02:00
..
2012-07-31 16:52:21 +04:00
2010-08-07 20:25:17 +02:00
2012-08-28 17:30:34 +02:00
2012-08-28 17:30:34 +02:00
2012-07-31 16:52:21 +04:00
2012-04-19 01:10:55 +02:00
2012-04-02 22:08:46 -04:00
2012-09-13 19:03:31 +02:00
2012-09-13 19:03:31 +02:00
2012-09-13 19:03:31 +02:00
2012-09-13 19:03:31 +02:00
2012-04-11 18:53:13 +02:00
2012-09-13 00:21:58 +02:00
2012-09-13 00:21:58 +02:00
2012-09-13 19:03:31 +02:00