aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-09-03 19:18:03 +0100
committerMelanie2010-09-03 19:18:03 +0100
commit5cbc4e2a5fdc844164b09a117f0a87d271e9af39 (patch)
treee3a858c5dc2f1acd6ce26a32b81f3aea62a87abd /OpenSim/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentLast+2 tweak (diff)
downloadopensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.zip
opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.tar.gz
opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.tar.bz2
opensim-SC_OLD-5cbc4e2a5fdc844164b09a117f0a87d271e9af39.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
0 files changed, 0 insertions, 0 deletions