1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 12:42:11 +00:00
OpenMW/libs/openengine/bullet
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
..
BtOgre.cpp Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
BtOgreExtras.h
BtOgreGP.h Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
BtOgrePG.h
BulletShapeLoader.cpp Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
BulletShapeLoader.h Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
physic.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
physic.hpp Remove some outdated todo comments 2015-03-12 00:27:01 +01:00
trace.cpp
trace.h