diff options
| author | Melanie | 2012-11-12 15:46:45 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-12 15:46:45 +0000 |
| commit | d9b149b3756442224492ca24c2be3196a873489a (patch) | |
| tree | ec1e0649b7aef62ecb9475f78b467062f353866c /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix mantis #6425 (diff) | |
| download | opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.zip opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.tar.gz opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.tar.bz2 opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
0 files changed, 0 insertions, 0 deletions