Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 08:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Niraj Venkat eaf75c01b9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.h
2015-07-20 14:55:27 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources Working on line height 2015-07-17 14:33:32 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-20 14:55:27 -07:00
ui Avatar collision sounds. 2015-06-26 16:23:16 -07:00
CMakeLists.txt resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
interface_en.ts
InterfaceVersion.h.in