David Rowe 0b13accf94 Merge branch 'master' into addressbar-tidy ... Conflicts: interface/resources/qml/AddressBarDialog.qml		2015-06-19 17:42:27 -07:00
..
controls	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
styles
AddressBarDialog.qml	Merge branch 'master' into addressbar-tidy	2015-06-19 17:42:27 -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
TestDialog.qml	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
TestMenu.qml
TestRoot.qml
UpdateDialog.qml	Buttons are connected and execting old functions	2015-06-08 14:56:46 -06:00
VrMenu.qml
VrMenuItem.qml
WebEntity.qml