Lirusaito 2581935b36 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/newview/skins/default/xui/en-us/floater_post_process.xml - Used Mine, because Shyotl's is the ancient one from "the before time" and because my last commit (worked on motionblur tab, then, too.)

2012-09-22 15:12:45 -04:00

..

html

…

textures

Added icons for folders from phoenix, and created outbox folder icon for future use.

2012-07-18 20:26:19 -04:00

xui

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2012-09-22 15:12:45 -04:00

colors_base.xml

Fixeds and ToDones

2012-08-05 20:40:02 -04:00

colors.xml

…