diff options
| author | Melanie | 2012-11-20 01:20:59 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-20 01:20:59 +0000 |
| commit | ccc81183b042a62752b7be4b16e0ccc7dbd03b3f (patch) | |
| tree | e556eb6a576393799aa5eaa38afb35e0d64785ed /OpenSim/Framework/ColliderData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| download | opensim-SC-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.zip opensim-SC-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.tar.gz opensim-SC-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.tar.bz2 opensim-SC-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.tar.xz | |
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
Diffstat (limited to 'OpenSim/Framework/ColliderData.cs')
0 files changed, 0 insertions, 0 deletions