Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 4 insertions, 1 deletions

diff --git a/README.md b/README.md
index 552cdef..2aea328 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@ need to build OpenSim before running it.
 
 # Running OpenSim on Windows
 
+You will need .NET 4.0 installed to run OpenSimulator.
+
 We recommend that you run OpenSim from a command prompt on Windows in order
 to capture any errors.
 
@@ -29,7 +31,7 @@ Now see the "Configuring OpenSim" section
 
 # Running OpenSim on Linux
 
-You will need Mono >= 2.4.3 to run OpenSim.  On some Linux distributions you
+You will need Mono >= 2.10.8.1 to run OpenSimulator.  On some Linux distributions you
 may need to install additional packages.  See http://opensimulator.org/wiki/Dependencies
 for more information.
 
@@ -111,3 +113,4 @@ project can always be found at http://opensimulator.org.
 
 Thanks for trying OpenSim, we hope it is a pleasant experience.
 
+