aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
diff options
context:
space:
mode:
authorMelanie2012-04-03 23:22:47 +0200
committerMelanie2012-04-03 23:22:47 +0200
commitdbec5e98595cfe87d26ef74703433db7956ab66d (patch)
treef08d1aa4eaba984778e3738a8dc86832d10881b0 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
parentRemove duplicate implementation of Material { get; set; } (diff)
downloadopensim-SC-dbec5e98595cfe87d26ef74703433db7956ab66d.zip
opensim-SC-dbec5e98595cfe87d26ef74703433db7956ab66d.tar.gz
opensim-SC-dbec5e98595cfe87d26ef74703433db7956ab66d.tar.bz2
opensim-SC-dbec5e98595cfe87d26ef74703433db7956ab66d.tar.xz
Fix more merge artefacts
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs')
0 files changed, 0 insertions, 0 deletions