Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 10:27:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
ZappoMan 9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
..
external fix typo from overwrite of gverb/readme.txt 2014-11-26 10:41:23 -08:00
resources moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
ui Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in