diff options
author | Melanie | 2012-05-16 12:40:45 +0100 |
---|---|---|
committer | Melanie | 2012-05-16 12:40:45 +0100 |
commit | 597f99bca7f0bbea9a1346b7c19c38a58f25257c (patch) | |
tree | fd267a58cd1ea2a3500c7b37253bd1ccfef279b9 /OpenSim/Region/Framework/Scenes/SOPMaterial.cs | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format... (diff) | |
download | opensim-SC-597f99bca7f0bbea9a1346b7c19c38a58f25257c.zip opensim-SC-597f99bca7f0bbea9a1346b7c19c38a58f25257c.tar.gz opensim-SC-597f99bca7f0bbea9a1346b7c19c38a58f25257c.tar.bz2 opensim-SC-597f99bca7f0bbea9a1346b7c19c38a58f25257c.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SOPMaterial.cs')
0 files changed, 0 insertions, 0 deletions