diff options
| author | Melanie | 2013-07-18 10:08:10 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-18 10:08:10 +0100 |
| commit | 7830cc995471120892a24a39e86283774fa07c4c (patch) | |
| tree | d3f46b4f3ce95bb8572511c6f12c9f8ca86922c8 /bin/lib64/libopenjpeg-dotnet-x86_64.so | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Document obscure Groups config related to the user level required for creatin... (diff) | |
| download | opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.zip opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.gz opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.bz2 opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
Diffstat (limited to 'bin/lib64/libopenjpeg-dotnet-x86_64.so')
0 files changed, 0 insertions, 0 deletions