Merge branch 'master' into careminster

Browse Source

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

...

This commit is contained in:

Melanie

2012-03-03 09:58:57 +00:00

parent 6386fdcda7 c2c102d33e

commit 1f32730798

28 changed files with 275 additions and 322 deletions

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

BIN

bin/Google.ProtocolBuffers.dll

Binary file not shown.

BIN

bin/Iesi.Collections.dll

Binary file not shown.

BIN

bin/Kds.Serialization.dll

Binary file not shown.

BIN

bin/MonoXnaCompactMaths.dll

Binary file not shown.