diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /TESTING.txt | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
| -rw-r--r-- | TESTING.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TESTING.txt b/TESTING.txt index e7ab088..da9dd60 100644 --- a/TESTING.txt +++ b/TESTING.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | = The Quick Guide to OpenSim Unit Testing = | 1 | = The Quick Guide to OpenSim Unit Testing = |
| 2 | 2 | ||
| 3 | == Running Tests == | 3 | == Running Tests == |
| 4 | 4 | ||