diff options
| author | Diva Canto | 2010-06-19 09:02:36 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-19 09:02:36 -0700 |
| commit | 2b76dba5935186f3b3af32d642d599d5b9394a7a (patch) | |
| tree | 288e3bd340c16fe38feb19f385b475006ad154b2 /OpenSim/Region/Application/OpenSim.cs | |
| parent | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. T... (diff) | |
| parent | Reinstated the behavior of AddPrimShape as it was as of December. Trying to f... (diff) | |
| download | opensim-SC-2b76dba5935186f3b3af32d642d599d5b9394a7a.zip opensim-SC-2b76dba5935186f3b3af32d642d599d5b9394a7a.tar.gz opensim-SC-2b76dba5935186f3b3af32d642d599d5b9394a7a.tar.bz2 opensim-SC-2b76dba5935186f3b3af32d642d599d5b9394a7a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
0 files changed, 0 insertions, 0 deletions