diff options
| author | Melanie | 2012-07-16 21:32:10 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-16 21:32:10 +0100 |
| commit | 7b9c4d2826eea1d41a0df47807143b1fe08814d9 (patch) | |
| tree | 3e59fc50bdf58fb49f46d14c584d46258db95c20 /Makefile | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | update PrimMesher.cs to dll version r72 which fixes some path errors in slice... (diff) | |
| download | opensim-SC-7b9c4d2826eea1d41a0df47807143b1fe08814d9.zip opensim-SC-7b9c4d2826eea1d41a0df47807143b1fe08814d9.tar.gz opensim-SC-7b9c4d2826eea1d41a0df47807143b1fe08814d9.tar.bz2 opensim-SC-7b9c4d2826eea1d41a0df47807143b1fe08814d9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions