Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 18:39:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Brad Davis fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
2015-04-24 18:02:12 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources Merge branch 'ui-refactor' into m_and_m 2015-04-24 18:02:12 -07:00
src Merge branch 'ui-refactor' into m_and_m 2015-04-24 18:02:12 -07:00
ui Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-14 13:13:15 -07:00
CMakeLists.txt Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in