Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/interface/resources/qml/hifi/dialogs
History
David Rowe 7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-04-22 13:19:47 +12:00
..
attachments
AttachmentsDialog.qml
AudioPreferencesDialog.qml
AvatarAttachmentsDialog.qml
AvatarPreferencesDialog.qml
GeneralPreferencesDialog.qml
GraphicsPreferencesDialog.qml
LodPreferencesDialog.qml
ModelBrowserDialog.qml
RunningScripts.qml Merge branch 'master' into 20872 2016-04-22 13:19:47 +12:00
SnapshotShareDialog.qml