Latif Khalifa e0077b6941 Merge remote-tracking branch 'lirusaito/master' ...

Conflicts:
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
	indra/newview/skins/default/xui/fr/panel_preferences_general.xml

2013-04-23 12:17:08 +02:00

..

apollo

Update LSL information (Adds new AnimationOverride)

2013-04-19 23:59:05 +02:00

blackdark

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blacklightblue

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blackred

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

dark

…

darkcatalan

…

darkgred

…

darkorange

…

default

Merge remote-tracking branch 'lirusaito/master'

2013-04-23 12:17:08 +02:00

emerald

…

frenchtouch

…

gemini

Update LSL information (Adds new AnimationOverride)

2013-04-19 23:59:05 +02:00

gred

…

italia

…

kdarknv

…

kirstenLite2

…

kliteat

…

nanogreen

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

nanopurple

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

new_silver

…

openlife

…

orangelife

…

ponyaquablue

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

ponypurple

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

pslgreen

…

pslpurple

…

ruby

…

sapphire

…

secondlove

…

silver

…

snowwhite

…

stpatrick

…

white_emerald

…

wisdom

…

Apollo.xml

…

blackdark.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blacklightblue.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

blackred.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

dark.xml

…

DarkCatalan.xml

…

DarkOrange.xml

…

DarkRed.xml

…

Default.xml

…

Emerald.xml

…

FrenchTouch.xml

…

Gemini.xml

…

GregsRed.xml

…

Italia.xml

…

kDarkNvid.xml

…

KirstenLite2.xml

…

kliteat.xml

…

nanogreen.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

nanopurple.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

New_Silver.xml

…

OpenLife.xml

…

OrangeLife.xml

…

paths.xml

…

Pony-Aquablue.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

Pony-Purple.xml

Make the actual skin folders lowercase

2013-03-04 17:10:19 -05:00

pslgreen.xml

…

pslpurple.xml

…

Ruby.xml

…

sapphire.xml

…

SecondLove.xml

…

Silver.xml

…

SnowWhite.xml

…

StPatrick.xml

…

White.xml

…

wisdom.xml

…