diff options
| author | Melanie | 2012-06-06 14:16:19 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 14:16:19 +0100 |
| commit | c0b21d92c2219c3bfd69e1467c28f20859dd4dc7 (patch) | |
| tree | edb346e1bcde87b1029babc753df9279e4102239 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | fix the real cause of double velocity (diff) | |
| download | opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework')
0 files changed, 0 insertions, 0 deletions