Merge branch 'avination' into careminster

Browse Source

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs

...

This commit is contained in:

Melanie

2012-11-04 23:30:11 +00:00

parent 006d70582b 08b37efc32

commit 4d6ee1aea6

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