aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Constants.cs
diff options
context:
space:
mode:
authorMelanie2013-06-07 23:09:53 +0100
committerMelanie2013-06-07 23:09:53 +0100
commit45e333652c75bc3101ac7f757105b6f7ed5024a5 (patch)
treee23ffd4f6ca0d20ef0501c683d9659c09c7c2d3e /OpenSim/Framework/Constants.cs
parentMerge branch 'master' into careminster (diff)
parentminor: add dr0berts to contributors list (diff)
downloadopensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.zip
opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.gz
opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.bz2
opensim-SC-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions