aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-12-21 23:00:01 +0000
committerMelanie2010-12-21 23:00:01 +0000
commit303c02133fe2bb7ff4fe499dc855bb358ca4fcb6 (patch)
tree75fef05c6b22bbce3c6364cdf5b8c8a8ed193448 /OpenSim/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentWhat is the point of using different types to express the same damn thing? (diff)
downloadopensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.zip
opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.tar.gz
opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.tar.bz2
opensim-SC_OLD-303c02133fe2bb7ff4fe499dc855bb358ca4fcb6.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions