Merge branch 'avination-current'

Browse Source

Conflicts:
	OpenSim/Framework/AvatarAppearance.cs

...

This commit is contained in:

Melanie Thielker

2014-08-11 18:45:34 +02:00

parent 519df0d2a3 0eaabef1dc

commit 1e0dc83d80

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available