Brad Davis 4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp		2015-06-16 21:01:00 -07:00
..
controls	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
styles	Add remainder of dialog content and polish look	2015-06-04 22:27:23 -07:00
AddressBarDialog.qml	Rename new Dialog to DialogContainer	2015-06-06 10:42:49 -07:00
Browser.qml	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
ErrorDialog.qml	Rename new Dialog to DialogContainer	2015-06-06 10:42:49 -07:00
InfoView.qml	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
LoginDialog.qml	Rename new Dialog to DialogContainer	2015-06-06 10:42:49 -07:00
MarketplaceDialog.qml	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
MessageDialog.qml	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
Palettes.qml
Root.qml
RootMenu.qml
Stats.qml	Working on overlays / stats	2015-06-16 21:00:13 -07:00
TestDialog.qml	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
TestMenu.qml
TestRoot.qml
Tooltip.qml	Working on overlays / stats	2015-06-16 21:00:13 -07:00
UpdateDialog.qml	Buttons are connected and execting old functions	2015-06-08 14:56:46 -06:00
VrMenu.qml
VrMenuItem.qml
WebEntity.qml