diff options
| author | Melanie | 2012-10-04 20:16:23 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-04 20:16:23 +0100 |
| commit | 637e9a10db25930a3a23b98fb8f3fe6040335bf4 (patch) | |
| tree | 3df797463214861c86f7068280e6ab07b97c1066 /OpenSim/Framework/Servers/Tests/OSHttpTests.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Allow default animation to be stopped to be replaced with another one. (diff) | |
| download | opensim-SC_OLD-637e9a10db25930a3a23b98fb8f3fe6040335bf4.zip opensim-SC_OLD-637e9a10db25930a3a23b98fb8f3fe6040335bf4.tar.gz opensim-SC_OLD-637e9a10db25930a3a23b98fb8f3fe6040335bf4.tar.bz2 opensim-SC_OLD-637e9a10db25930a3a23b98fb8f3fe6040335bf4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Framework/Servers/Tests/OSHttpTests.cs')
0 files changed, 0 insertions, 0 deletions