Ryan Huffman a07d92b6ea Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection ... Conflicts: interface/src/Audio.cpp interface/src/Audio.h interface/src/Menu.cpp interface/src/ui/PreferencesDialog.cpp		2015-01-07 09:46:07 -08:00
..
chatWindow.ui
console.ui
loginDialog.ui
preferencesDialog.ui	Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection	2015-01-07 09:46:07 -08:00
runningScriptsWidget.ui
scriptEditorWidget.ui
scriptEditorWindow.ui
shareSnapshot.ui
updateDialog.ui
userLocationsDialog.ui