Beeks 7eca5b9fcc Merge branch 'master' of github.com:Beeks/Ascent ...

Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml

2010-10-26 23:08:41 -04:00

..

html

Imported existing code

2010-04-02 02:48:44 -03:00

textures

Tweak to the texture listing to try to get some semi-needed textures to preload

2010-09-10 20:04:53 -04:00

xui

Merge branch 'master' of github.com:Beeks/Ascent

2010-10-26 23:08:41 -04:00

colors_base.xml

Adding ComboBGColor to default skin.

2010-10-05 11:13:19 -04:00

colors.xml

Imported existing code

2010-04-02 02:48:44 -03:00