Thijs Wenker 1634e574d7 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561		2014-04-15 00:40:48 +02:00
..
chatWindow.ui	Update resource urls for chat window close button	2014-04-14 11:34:27 -07:00
preferencesDialog.ui	removed dependency on QT resource	2014-04-11 00:54:54 +02:00
runningScriptsWidget.ui	Modify UIs that were using the qrc	2014-04-11 11:59:23 -07:00
ScriptEditorWidget.ui	Initial script editor widget / icons made by MaximillianMerlin ty	2014-04-15 00:30:01 +02:00
ScriptEditorWindow.ui	Initial script editor widget / icons made by MaximillianMerlin ty	2014-04-15 00:30:01 +02:00
updateDialog.ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00