overte-HifiExperiments/interface/resources/images
Ryan Huffman aaddecd024 Merge remote-tracking branch 'upstream/master' into 19554
Conflicts:
	interface/resources/resources.qrc
	interface/ui/chatWindow.ui
2014-04-14 11:20:49 -07:00
..
audio-box.svg Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
close.svg Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
close_down.svg Update behavior of chat window close button 2014-04-10 12:19:27 -07:00
hifi-interface-tools-v2-pie.svg merge 2013-08-01 15:48:57 -07:00
kill-script.svg Manual merge 2014-04-02 18:07:55 -07:00
mic-mute.svg Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
mic.svg Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
minus.svg Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
pin.svg Fixed docking of ChatWindow 2014-04-11 00:45:38 +02:00
pinned.svg Fixed docking of ChatWindow 2014-04-11 00:45:38 +02:00
plus.svg Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
reload.svg Manual merge 2014-04-02 18:07:55 -07:00
reset.png reset view 2013-10-28 18:19:31 +01:00
stop.svg Manual merge 2014-04-02 18:07:55 -07:00