diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /runprebuild.sh | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'runprebuild.sh')
| -rwxr-xr-x | runprebuild.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/runprebuild.sh b/runprebuild.sh index d276edb..8c18db6 100755 --- a/runprebuild.sh +++ b/runprebuild.sh | |||
| @@ -22,21 +22,11 @@ case "$1" in | |||
| 22 | 22 | ||
| 23 | ;; | 23 | ;; |
| 24 | 24 | ||
| 25 | |||
| 26 | 'vs2008') | ||
| 27 | |||
| 28 | mono bin/Prebuild.exe /target vs2008 | ||
| 29 | |||
| 30 | ;; | ||
| 31 | |||
| 32 | |||
| 33 | *) | 25 | *) |
| 34 | 26 | ||
| 35 | mono bin/Prebuild.exe /target nant | 27 | mono bin/Prebuild.exe /target nant |
| 36 | mono bin/Prebuild.exe /target vs2008 | 28 | mono bin/Prebuild.exe /target vs2010 |
| 37 | 29 | ||
| 38 | ;; | 30 | ;; |
| 39 | 31 | ||
| 40 | |||
| 41 | esac | 32 | esac |
| 42 | |||