ZappoMan ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI ... Conflicts: interface/src/Application.cpp interface/src/Application.h		2015-04-14 13:13:15 -07:00
..
avatarAppearance.ui	first cut at moving avatar appearance into separate dialog box	2015-04-14 10:38:22 -07:00
chatWindow.ui
console.ui
loginDialog.ui	Use constants for URLs	2015-04-01 07:24:16 +02:00
preferencesDialog.ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
runningScriptsWidget.ui
scriptEditorWidget.ui
scriptEditorWindow.ui	Update script editor to set icons programatically	2015-04-02 09:10:47 -07:00
shareSnapshot.ui
updateDialog.ui
userLocationsDialog.ui