Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

Browse Source

Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

...

This commit is contained in:

Melanie

2012-01-30 19:49:12 +00:00

parent df9c35bc0f 54e6b2402c

commit ea16c9f858

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