diff options
| author | Melanie | 2012-11-08 04:51:00 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-08 04:51:00 +0000 |
| commit | b3e99a4d484d805866a6b7c40389683a98c8db36 (patch) | |
| tree | 2ca7a1655e91212c605c49109ace0209fed1b546 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add skeleton classes for shape objectification. This will eventual... (diff) | |
| download | opensim-SC-b3e99a4d484d805866a6b7c40389683a98c8db36.zip opensim-SC-b3e99a4d484d805866a6b7c40389683a98c8db36.tar.gz opensim-SC-b3e99a4d484d805866a6b7c40389683a98c8db36.tar.bz2 opensim-SC-b3e99a4d484d805866a6b7c40389683a98c8db36.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
0 files changed, 0 insertions, 0 deletions