diff options
author | Melanie | 2010-12-21 20:54:28 +0000 |
---|---|---|
committer | Melanie | 2010-12-21 20:54:28 +0000 |
commit | a31b96e1ba755122220d4dd8e5e04d721910a2fc (patch) | |
tree | f3be9fbbffe55dc960d28215516eac112bc87c92 /OpenSim/Data/Properties | |
parent | Make prim inventories a bit more sane (diff) | |
download | opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.zip opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.tar.gz opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.tar.bz2 opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.tar.xz |
Fix up merge artifacts
Diffstat (limited to 'OpenSim/Data/Properties')
0 files changed, 0 insertions, 0 deletions