Thijs Wenker 7125b6ab8e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 ... Conflicts: interface/src/Application.cpp		2014-04-30 20:08:11 +02: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	Snapshot preferences title	2014-04-15 23:29:28 +02:00
runningScriptsWidget.ui	Update location of Load Script button	2014-04-25 10:14:18 -07:00
scriptEditorWidget.ui	Changed font sizes in script-editor to pixels, it should he readable in both Windows and OSX now	2014-04-29 20:12:16 +02:00
scriptEditorWindow.ui	ScriptEditorWindow not modal, but yet always on foreground	2014-04-29 23:53:46 +02:00
updateDialog.ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00