diff options
| author | Melanie | 2012-11-11 16:31:01 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-11 16:31:01 +0000 |
| commit | 389077345f9fc78fddcaa39e29daa532a32815d6 (patch) | |
| tree | a455d88d93ac5fe984ebf5342276ca1ddc831442 /bin/assets/GesturesAssetSet/wink_.dat | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still I... (diff) | |
| download | opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.zip opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.tar.gz opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.tar.bz2 opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions