Lirusaito 39b3f58e13 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer ...

# Conflicts:
#	indra/newview/llvoavatar.cpp
Also Reverted reversion of removal of before() wrapper in llstl.h

2016-05-02 15:15:06 -04:00

..

apollo

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

blackdark

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

blacklightblue

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

blackred

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

dark

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

darkcatalan

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

darkgred

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

darkgreen

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

darkorange

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

default

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

2016-05-02 15:15:06 -04:00

emerald

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

frenchtouch

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

gemini

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

gred

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

italia

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

kdarknv

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

kirstenLite2

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

kliteat

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

nanogreen

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

nanopurple

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

new_silver

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

openlife

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

orangelife

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

ponyaquablue

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

ponypurple

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

pslgreen

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

pslpurple

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

retro

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

ruby

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

sapphire

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

secondlove

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

silver

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

snowwhite

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

stpatrick

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

white_emerald

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

wisdom

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00

Apollo.xml

…

blackdark.xml

…

blacklightblue.xml

…

blackred.xml

…

dark.xml

…

DarkCatalan.xml

…

DarkGreen.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

…

nanopurple.xml

…

New_Silver.xml

…

OpenLife.xml

…

OrangeLife.xml

…

paths.xml

…

Pony-Aquablue.xml

…

Pony-Purple.xml

…

pslgreen.xml

…

pslpurple.xml

…

Retro.xml

…

Ruby.xml

…

sapphire.xml

…

SecondLove.xml

…

Silver.xml

…

SnowWhite.xml

…

StPatrick.xml

…

White.xml

…

wisdom.xml

…