Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Brad Hefta-Gaub 347933f1a5 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/particles/src/ParticleTreeElement.cpp
2014-01-21 02:15:46 -08:00
..
external Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-16 14:33:44 -08:00
resources Removed a couple more resources. 2014-01-16 15:17:38 -08:00
src Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 2014-01-21 02:15:46 -08:00
CMakeLists.txt Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-16 14:33:44 -08:00
interface.icns
InterfaceConfig.h.in Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in Tidy up 2013-12-16 11:05:08 -06:00