Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface/resources/styles
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
..
avatar.svg UI changes 2014-02-25 20:36:14 +01:00
checked.svg Dialog layout 2013-12-22 15:06:40 +01:00
close.svg UI changes 2014-02-25 20:36:14 +01:00
console.qss Update JSConsole colors 2014-05-27 14:09:53 -07:00
down.svg UI changes 2014-02-25 20:36:14 +01:00
global.qss - Layout fix 2014-03-21 22:34:10 +01:00
import_dialog.qss cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Inconsolata.otf added dialog for log data 2013-12-16 22:43:17 +01:00
log_dialog.qss missing 'extra debugging' check icon; fix font 2014-04-29 00:02:24 +02:00
preferences.qss Add ScriptsLocation settings value 2014-05-14 00:28:11 -07:00
search.svg Dialog layout 2013-12-22 15:06:40 +01:00
slider-bg.svg UI changes 2014-02-25 20:36:14 +01:00
slider-handle.svg UI changes 2014-02-25 20:36:14 +01:00
txt-file.svg Dialog layout 2013-12-22 15:06:40 +01:00
unchecked.svg Dialog layout 2013-12-22 15:06:40 +01:00
up.svg UI changes 2014-02-25 20:36:14 +01:00
wrench.svg UI changes 2014-02-25 20:36:14 +01:00