Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 03:58:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface/ui
History
Ryan Huffman 355fe01490 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/RunningScriptsWidget.cpp
	interface/ui/preferencesDialog.ui
	interface/ui/runningScriptsWidget.ui
2014-06-11 13:30:47 -07:00
..
chatWindow.ui Fix chat scroll bar widget jumping 2014-05-25 16:41:01 -07:00
console.ui Update console style 2014-05-27 08:57:29 -07:00
loginDialog.ui change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
preferencesDialog.ui Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-11 13:30:47 -07:00
runningScriptsWidget.ui remove all key bindings from running scripts dialog 2014-05-28 23:19:15 +05:30
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