diff options
| author | Melanie | 2011-11-11 23:43:18 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-11 23:43:18 +0000 |
| commit | a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e (patch) | |
| tree | f19e00c12dfe753ee218eccd98b5a21304018247 /BUILDING.txt | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Make log messages on authentication failure more explicit (diff) | |
| download | opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.zip opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.gz opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.bz2 opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to '')
| -rw-r--r-- | BUILDING.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/BUILDING.txt b/BUILDING.txt index e929cbf..0fb68cb 100644 --- a/BUILDING.txt +++ b/BUILDING.txt | |||
| @@ -12,7 +12,7 @@ Steps: | |||
| 12 | === Building on Linux === | 12 | === Building on Linux === |
| 13 | 13 | ||
| 14 | Prereqs: | 14 | Prereqs: |
| 15 | * Mono >= 2.4.2 | 15 | * Mono >= 2.4.3 |
| 16 | * Nant >= 0.85 | 16 | * Nant >= 0.85 |
| 17 | * On some Linux distributions you may need to install additional packages. | 17 | * On some Linux distributions you may need to install additional packages. |
| 18 | See http://opensimulator.org/wiki/Dependencies for more information. | 18 | See http://opensimulator.org/wiki/Dependencies for more information. |
| @@ -28,5 +28,3 @@ From the distribution type: | |||
| 28 | 28 | ||
| 29 | Helpful resources: | 29 | Helpful resources: |
| 30 | * http://opensimulator.org/wiki/Build_Instructions | 30 | * http://opensimulator.org/wiki/Build_Instructions |
| 31 | |||
| 32 | |||