Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 20:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface
History
Atlante45 11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
2014-12-16 15:02:37 -08:00
..
external fix typo from overwrite of gverb/readme.txt 2014-11-26 10:41:23 -08:00
resources remove old unused shaders 2014-12-11 13:59:21 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 2014-12-16 15:02:37 -08:00
ui Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
CMakeLists.txt move TextureCache to library 2014-12-15 13:14:16 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in