diff options
| author | Melanie | 2012-02-19 20:08:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-19 20:08:01 +0100 |
| commit | 96409cc2eeb4555609f72c8bc61fbdf4ac3e9933 (patch) | |
| tree | 394a7a07ff913c8efa390399c190d5c65bf8f95b /runprebuild.bat | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | moved vehicle from SOG to SOP (diff) | |
| download | opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.zip opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.gz opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.bz2 opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.xz | |
Merge branch 'ubitwork'
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
Diffstat (limited to 'runprebuild.bat')
| -rwxr-xr-x | runprebuild.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runprebuild.bat b/runprebuild.bat index 8927e9a..9265391 100755 --- a/runprebuild.bat +++ b/runprebuild.bat | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | bin\Prebuild.exe /target nant | 1 | bin\Prebuild.exe /target nant |
| 2 | bin\Prebuild.exe /target vs2008 | 2 | bin\Prebuild.exe /target vs2008 |
| 3 | echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat | 3 | echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat |
| 4 | 4 | ||