diff options
| author | Melanie | 2012-03-03 09:58:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-03 09:58:57 +0000 |
| commit | 1f32730798c7633bbed47736a1b302dcd13ce903 (patch) | |
| tree | 2456fc1135e91e56e0d17d9fbe67f147b7f5fda2 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo... (diff) | |
| download | opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.zip opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.tar.gz opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.tar.bz2 opensim-SC_OLD-1f32730798c7633bbed47736a1b302dcd13ce903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/Google.ProtocolBuffers.dll | bin | 246784 -> 0 bytes |
| -rwxr-xr-x | bin/Iesi.Collections.dll | bin | 32768 -> 0 bytes |
| -rwxr-xr-x | bin/Kds.Serialization.dll | bin | 40960 -> 0 bytes |
| -rwxr-xr-x | bin/MonoXnaCompactMaths.dll | bin | 36864 -> 0 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/bin/Google.ProtocolBuffers.dll b/bin/Google.ProtocolBuffers.dll deleted file mode 100755 index 666aa93..0000000 --- a/bin/Google.ProtocolBuffers.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/Iesi.Collections.dll b/bin/Iesi.Collections.dll deleted file mode 100755 index 107c362..0000000 --- a/bin/Iesi.Collections.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll deleted file mode 100755 index 7f03277..0000000 --- a/bin/Kds.Serialization.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/MonoXnaCompactMaths.dll b/bin/MonoXnaCompactMaths.dll deleted file mode 100755 index 9fe8334..0000000 --- a/bin/MonoXnaCompactMaths.dll +++ /dev/null | |||
| Binary files differ | |||