stojce 939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/src/Menu.h		2014-03-13 18:41:58 +01:00
..
chatWindow.ui	Hid the chat window rather than close it in order to preserve sent	2014-03-13 14:07:21 +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