aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Resources/OpenSim.Data.addin.xml
diff options
context:
space:
mode:
authorMelanie2010-01-28 02:07:18 +0000
committerMelanie2010-01-28 02:07:18 +0000
commit2d9b69c186238c7b5e578189f17ee0ab24dd3bb4 (patch)
treed622a8f2ca6c1c3bf638c65ac05f1faa19fcc615 /OpenSim/Data/Resources/OpenSim.Data.addin.xml
parentSome merge fixups (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.zip
opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.gz
opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.bz2
opensim-SC_OLD-2d9b69c186238c7b5e578189f17ee0ab24dd3bb4.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/Resources/OpenSim.Data.addin.xml')
0 files changed, 0 insertions, 0 deletions