Latif Khalifa 8584e6da4c Merge branch 'master' into meshupload ...

Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h

2013-01-30 00:36:31 +01:00

..

apollo

Gemini young age color should look more natural for Gemini.

2012-12-26 13:09:05 -05:00

Blackdark

Skins request! Black Red, Black Light Blue, and Black Dark!

2012-12-30 16:07:07 -05:00

Blacklightblue

Skins request! Black Red, Black Light Blue, and Black Dark!

2012-12-30 16:07:07 -05:00

Blackred

Skins request! Black Red, Black Light Blue, and Black Dark!

2012-12-30 16:07:07 -05:00

dark

…

darkcatalan

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

darkgred

…

darkorange

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

default

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

emerald

…

frenchtouch

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

gemini

Gemini young age color should look more natural for Gemini.

2012-12-26 13:09:05 -05:00

gred

…

italia

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kdarknv

…

kirstenLite2

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kliteat

…

new_silver

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

openlife

…

orangelife

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

Pony-Aquablue

…

Pony-Purple

…

pslgreen

…

pslpurple

…

ruby

…

sapphire

…

secondlove

Added Nomade's SecondLove skin

2012-08-25 16:23:29 -04:00

silver

…

snowwhite

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

stpatrick

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

white_emerald

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

wisdom

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

Apollo.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

blackdark.xml

Skins request! Black Red, Black Light Blue, and Black Dark!

2012-12-30 16:07:07 -05:00

blacklightblue.xml

Skins request! Black Red, Black Light Blue, and Black Dark!

2012-12-30 16:07:07 -05:00

blackred.xml

Skins request! Black Red, Black Light Blue, and Black Dark!

2012-12-30 16:07:07 -05:00

dark.xml

…

DarkCatalan.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

DarkOrange.xml

…

DarkRed.xml

…

Default.xml

…

Emerald.xml

…

FrenchTouch.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

Gemini.xml

…

GregsRed.xml

…

Italia.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kDarkNvid.xml

…

KirstenLite2.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

kliteat.xml

…

New_Silver.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

OpenLife.xml

…

OrangeLife.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

paths.xml

…

Pony-Aquablue.xml

…

Pony-Purple.xml

…

pslgreen.xml

…

pslpurple.xml

…

Ruby.xml

…

sapphire.xml

…

SecondLove.xml

Added Nomade's SecondLove skin

2012-08-25 16:23:29 -04:00

Silver.xml

…

SnowWhite.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

StPatrick.xml

Skins update, enter Nomade's (cleaned up) skins!

2012-08-23 18:51:40 -04:00

White.xml

…

wisdom.xml

…