stojce 6d15fb548c Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/interface_en.ts		2014-03-14 21:05:30 +01:00
..
chatWindow.ui	Moved the chat from a window to a built-in panel.	2014-03-14 01:12:25 +02:00
preferencesDialog.ui	UI changes	2014-02-25 20:36:14 +01:00
updateDialog.ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00