aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
diff options
context:
space:
mode:
authorMelanie2012-01-02 21:41:36 +0000
committerMelanie2012-01-02 21:41:36 +0000
commita6e305063e9045194cd8348f73f3b75d07f3883e (patch)
treec3287856ea47817715da89c737e3ccfe4d4c9f5d /OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
parentMerge branch 'master' into careminster (diff)
parentReduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff)
downloadopensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.zip
opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.gz
opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.bz2
opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-17 10:48:19 +0000