Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 15:43:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
ZappoMan 7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
..
external More work on Faceplus integration. 2014-04-09 11:54:55 -07:00
resources Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 2014-04-11 12:08:17 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-14 09:43:29 -07:00
ui Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 2014-04-11 12:08:17 -07:00
CMakeLists.txt Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
interface.icns
interface_en.ts first cut at new version of audio refelctor 2014-04-13 19:11:25 -07:00
InterfaceConfig.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00