Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-24 10:08:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/cmake
History
Andrew Meadows d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
2015-01-16 14:36:27 -08:00
..
macros more correct cmake config for Bullet 2015-01-15 11:38:38 -08:00
modules merge upstream/master into andrew/bispinor 2015-01-16 14:36:27 -08:00