aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/README.md
diff options
context:
space:
mode:
authorMelanie Thielker2014-06-21 00:39:55 +0200
committerMelanie Thielker2014-06-21 00:39:55 +0200
commit159fcbf150b7da0e229b29aa7b94793484543d12 (patch)
treeb8c0ff3b4c758a3fba8315b556c923ef4c02a185 /README.md
parentMerge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-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 'README.md')
-rw-r--r--README.md5
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.
17 17
18# Running OpenSim on Windows 18# Running OpenSim on Windows
19 19
20You will need .NET 4.0 installed to run OpenSimulator.
21
20We recommend that you run OpenSim from a command prompt on Windows in order 22We recommend that you run OpenSim from a command prompt on Windows in order
21to capture any errors. 23to capture any errors.
22 24
@@ -29,7 +31,7 @@ Now see the "Configuring OpenSim" section
29 31
30# Running OpenSim on Linux 32# Running OpenSim on Linux
31 33
32You will need Mono >= 2.4.3 to run OpenSim. On some Linux distributions you 34You will need Mono >= 2.10.8.1 to run OpenSimulator. On some Linux distributions you
33may need to install additional packages. See http://opensimulator.org/wiki/Dependencies 35may need to install additional packages. See http://opensimulator.org/wiki/Dependencies
34for more information. 36for more information.
35 37
@@ -111,3 +113,4 @@ project can always be found at http://opensimulator.org.
111 113
112Thanks for trying OpenSim, we hope it is a pleasant experience. 114Thanks for trying OpenSim, we hope it is a pleasant experience.
113 115
116