Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 11:40:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/interface
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
..
external Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 2015-01-15 02:28:31 +01:00
resources Merge pull request #4027 from huffman/grid-shader-updates 2015-01-05 13:00:05 -08:00
src merge upstream/master into andrew/bispinor 2015-01-16 14:36:27 -08:00
ui changed "Load Scripts" label to be better understandable 2015-01-13 01:09:28 +01:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 2015-01-15 02:28:31 +01:00
interface.icns
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in