diff options
author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
---|---|---|
committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Tools | |
parent | rewrote hanging llParseStringKeepNulls() (diff) | |
parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-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"> |