Ryan Huffman 4115e0fab2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 ... Conflicts: interface/src/Application.cpp interface/ui/preferencesDialog.ui		2014-05-21 13:42:37 -07:00
..
chatWindow.ui	Fix chat input textbox to use native scrollbar	2014-04-23 16:15:51 -07:00
loginDialog.ui	Update layout of login messages and move text to .ui file	2014-04-28 13:16:50 -07:00
preferencesDialog.ui	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644	2014-05-21 13:42:37 -07:00
runningScriptsWidget.ui	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644	2014-05-14 17:33:47 -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	ScriptEditorWindow not modal, but yet always on foreground	2014-04-29 23:53:46 +02:00
shareSnapshot.ui	Discourse upload image	2014-05-05 00:55:24 +02:00
updateDialog.ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00