aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorMelanie2012-07-13 02:27:16 +0100
committerMelanie2012-07-13 02:27:16 +0100
commit64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch)
tree12e0aaae0401cde2e4310f25efa96a64559ae939 /.gitignore
parentMerge branch 'master' into careminster (diff)
parentRemove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff)
downloadopensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip
opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz
opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2
opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions