Stojce Slavkovski 4d0ed5796e Merge branch 'master' of https://github.com/worklist/hifi into 19507 ... Conflicts: interface/interface_en.ts		2014-04-12 08:45:23 +02:00
..
chatWindow.ui	Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources	2014-04-11 12:08:17 -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
shareSnapshot.ui	fixed QTextEdit border color	2014-03-26 21:30:02 +01:00
updateDialog.ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00