aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
diff options
context:
space:
mode:
authorMelanie2012-10-30 01:02:20 +0000
committerMelanie2012-10-30 01:02:20 +0000
commit48569e856a9c9ced207652b10e2abde94c849687 (patch)
tree8955c0206f1822f4bbb44466fae74e18923d125c /OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
parentMerge branch 'avination' into careminster (diff)
parentMake MeshAssetReceived private. (diff)
downloadopensim-SC-48569e856a9c9ced207652b10e2abde94c849687.zip
opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.gz
opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2
opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions