Merge branch 'avination-current' into careminster

Browse Source

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

...

This commit is contained in:

Melanie

2013-08-02 00:23:40 +01:00

parent 598f63e984 bdc48e3e0f

commit b168d690bd

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