Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 03:30:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Brad Davis 031b294ae5 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/GlowEffect.h
	libraries/render-utils/src/TextureCache.cpp
2015-04-30 12:14:07 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources Importing peferred dialog look from browser branch 2015-04-28 00:26:24 -07:00
src Merge branch 'master' into plugins 2015-04-30 12:14:07 -07:00
ui Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-14 13:13:15 -07:00
CMakeLists.txt Merge branch 'master' into plugins 2015-04-30 12:14:07 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in