diff options
| author | Melanie | 2012-09-23 19:18:49 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-23 19:18:49 +0200 |
| commit | 291e57afb4bb4fb30230c76b28434da79e337e3f (patch) | |
| tree | ff8b8b3e06131ef0d89bdc5b0ae33da4563f2d61 /.hgignore | |
| parent | refix prior commit (diff) | |
| parent | try to allow free uploads for testing, if users prefix names with "TEST-". Let (diff) | |
| download | opensim-SC_OLD-291e57afb4bb4fb30230c76b28434da79e337e3f.zip opensim-SC_OLD-291e57afb4bb4fb30230c76b28434da79e337e3f.tar.gz opensim-SC_OLD-291e57afb4bb4fb30230c76b28434da79e337e3f.tar.bz2 opensim-SC_OLD-291e57afb4bb4fb30230c76b28434da79e337e3f.tar.xz | |
Merge branch 'ubitwork' into avination
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions