Ryan Huffman 45fdd00608 Merge remote-tracking branch 'upstream/master' into 19598 ... Conflicts: interface/src/ui/FramelessDialog.h		2014-04-28 09:13:00 -07:00
..
chatWindow.ui	Fix chat input textbox to use native scrollbar	2014-04-23 16:15:51 -07:00
loginDialog.ui	Fix issue with icon being disabled on login window while authenticating	2014-04-28 09:11:09 -07:00
preferencesDialog.ui	Snapshot preferences title	2014-04-15 23:29:28 +02:00
runningScriptsWidget.ui	Modify UIs that were using the qrc	2014-04-11 11:59:23 -07:00
scriptEditorWidget.ui	This should fix the ubuntu build	2014-04-21 06:33:20 +02:00
scriptEditorWindow.ui	This should fix the ubuntu build	2014-04-21 06:33:20 +02:00
updateDialog.ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00