diff options
| author | Melanie | 2014-01-28 20:47:36 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 20:47:36 +0000 |
| commit | 4ccb15290ea9686070311c8a62c0fd9e6b0787d8 (patch) | |
| tree | 5c4f69879983e87f567e11c59d8d8b83d0bd7bb4 /Makefile | |
| parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions