Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 21:13:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Brad Davis 9fafc920ee Merge branch 'homer' into plugins 
Conflicts:
	interface/src/Application.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
2015-07-20 13:53:15 -07:00
..
external
icon
resources Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
src Merge branch 'homer' into plugins 2015-07-20 13:53:15 -07:00
ui Merge fixes 2015-07-13 19:07:44 -07:00
CMakeLists.txt Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
interface_en.ts
InterfaceVersion.h.in