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 /bin/Robust.32BitLaunch.exe | |
| 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_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'bin/Robust.32BitLaunch.exe')
| -rw-r--r-- | bin/Robust.32BitLaunch.exe | bin | 5632 -> 5632 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe index 14a6db3..747d02f 100644 --- a/bin/Robust.32BitLaunch.exe +++ b/bin/Robust.32BitLaunch.exe | |||
| Binary files differ | |||