aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorDiva Canto2010-06-19 09:02:36 -0700
committerDiva Canto2010-06-19 09:02:36 -0700
commit2b76dba5935186f3b3af32d642d599d5b9394a7a (patch)
tree288e3bd340c16fe38feb19f385b475006ad154b2 /.gitignore
parentReinstated the behavior of AddPrimShape *exactly* as it was as of December. T... (diff)
parentReinstated the behavior of AddPrimShape as it was as of December. Trying to f... (diff)
downloadopensim-SC_OLD-2b76dba5935186f3b3af32d642d599d5b9394a7a.zip
opensim-SC_OLD-2b76dba5935186f3b3af32d642d599d5b9394a7a.tar.gz
opensim-SC_OLD-2b76dba5935186f3b3af32d642d599d5b9394a7a.tar.bz2
opensim-SC_OLD-2b76dba5935186f3b3af32d642d599d5b9394a7a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts: OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions