aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-01-18 06:18:10 +0000
committerMelanie2011-01-18 06:18:10 +0000
commitf3968c49590cc1ace2a94ecc8e1fa9423d65844c (patch)
treeeb55ff50708e087424094e7a9f88af1f7858bbfa /OpenSim/Region/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFix build break (diff)
downloadopensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.zip
opensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.gz
opensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.bz2
opensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
0 files changed, 0 insertions, 0 deletions