diff options
| author | Melanie | 2013-11-03 21:34:36 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-03 21:34:36 +0000 |
| commit | ba203ed94fb9fb27e4da2663dad6cac21d5892e3 (patch) | |
| tree | c03981fa7b9070af3cec331234b78762c49a8a06 /TESTING.txt | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add current .NET windows framework requirement to README. (diff) | |
| download | opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.zip opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.gz opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.bz2 opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 | ||