diff options
| author | Diva Canto | 2010-06-29 06:37:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
| commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
| tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Tools/Robust.32BitLaunch | |
| parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
| parent | This file wants to be committed. (diff) | |
| download | opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Tools/Robust.32BitLaunch')
| -rw-r--r-- | OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj index f19e082..481b3f8 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj +++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj | |||
| @@ -36,9 +36,9 @@ | |||
| 36 | <SpecificVersion>False</SpecificVersion> | 36 | <SpecificVersion>False</SpecificVersion> |
| 37 | <HintPath>..\..\..\bin\log4net.dll</HintPath> | 37 | <HintPath>..\..\..\bin\log4net.dll</HintPath> |
| 38 | </Reference> | 38 | </Reference> |
| 39 | <Reference Include="OpenSim.Server, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | 39 | <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |
| 40 | <SpecificVersion>False</SpecificVersion> | 40 | <SpecificVersion>False</SpecificVersion> |
| 41 | <HintPath>..\..\..\bin\OpenSim.Server.exe</HintPath> | 41 | <HintPath>..\..\..\bin\Robust.exe</HintPath> |
| 42 | </Reference> | 42 | </Reference> |
| 43 | <Reference Include="System" /> | 43 | <Reference Include="System" /> |
| 44 | <Reference Include="System.Core"> | 44 | <Reference Include="System.Core"> |