diff options
author | Melanie | 2011-01-27 02:43:52 +0100 |
---|---|---|
committer | Melanie | 2011-01-27 02:43:52 +0100 |
commit | 307a2c61ef8106ae6aad3cd4a25c9067cdaf888a (patch) | |
tree | fd4447a5306810c871634c3adc38ee002c9fb25e /OpenSim/Region/DataSnapshot | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.zip opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.tar.gz opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.tar.bz2 opensim-SC_OLD-307a2c61ef8106ae6aad3cd4a25c9067cdaf888a.tar.xz |
Fix merge artifacts
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions