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	Add style to chat entry	2014-10-08 03:12:53 +02:00
console.ui	Update console style	2014-05-27 08:57:29 -07:00
loginDialog.ui	change node auth URL to data.highfidelity.io	2014-05-22 14:24:19 -07:00
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	Update runningScripts layout and add tip message	2014-10-02 16:27:02 -07:00
scriptEditorWidget.ui	- Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition)	2014-04-30 23:32:41 +02:00
scriptEditorWindow.ui	Add checkbox that automatically reloads externally changed files	2014-06-29 21:50:16 -07:00
shareSnapshot.ui	Make changes to other UI forms as well	2014-06-21 16:27:13 +05:30
updateDialog.ui	more dialog fixes	2014-10-03 13:45:26 +02:00
userLocationsDialog.ui	Rename UserLocationsWindow to UserLocationsDialog	2014-07-01 20:03:05 -07:00