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
checked.svg
close.svg
console.qss	Update JSConsole colors	2014-05-27 14:09:53 -07:00
down.svg
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
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
slider-bg.svg
slider-handle.svg
txt-file.svg
unchecked.svg
up.svg
wrench.svg