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
runningScriptsWidget.ui
scriptEditorWidget.ui
scriptEditorWindow.ui
updateDialog.ui