diff options
| author | Melanie | 2012-07-28 00:39:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-28 00:39:36 +0100 |
| commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
| tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /bin/Ionic.Zip.dll | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
| download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
Diffstat (limited to 'bin/Ionic.Zip.dll')
| -rwxr-xr-x[-rw-r--r--] | bin/Ionic.Zip.dll | bin | 462336 -> 462336 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll index 95fa928..95fa928 100644..100755 --- a/bin/Ionic.Zip.dll +++ b/bin/Ionic.Zip.dll | |||
| Binary files differ | |||