Merge branch 'master' into careminster

Browse Source

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

avinationmerge

Melanie 2012-10-02 00:03:37 +01:00

parent b9a883f1ca 503ce70f74

commit 21c83d6238

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

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

Diff Content Not Available