overte/interface/ui
Ryan Huffman edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
2014-04-29 16:28:36 -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 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 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