stojce 8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/interface_en.ts interface/resources/resources.qrc interface/src/Menu.cpp		2014-04-04 21:16:29 +02:00
..
chatWindow.ui	Put the chat window above the 3D view and animated its showing.	2014-03-28 18:36:53 +02:00
preferencesDialog.ui
runningScriptsWidget.ui	Manual merge	2014-04-02 18:07:55 -07:00
updateDialog.ui