diff options
| author | Melanie | 2012-05-15 21:19:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-15 21:19:06 +0100 |
| commit | a36c487c791ba38a75433b92f5b0e5c75d9b52a4 (patch) | |
| tree | c502a631cbd54c43168a71240f872f76cf50b9c5 /OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.zip opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.tar.gz opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.tar.bz2 opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs')
0 files changed, 0 insertions, 0 deletions