aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.hgignore
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:47:35 +0100
committerMelanie2011-10-25 01:47:35 +0100
commitbe3939358b31f80a088c87ce76a30d5e3b6e1964 (patch)
treef3c083425a18d44c40f5cb67499694f88ee1d67c /.hgignore
parentMerge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge (diff)
parentrefactor: chain the two scene constructors together to eliminate more copypasta (diff)
downloadopensim-SC_OLD-be3939358b31f80a088c87ce76a30d5e3b6e1964.zip
opensim-SC_OLD-be3939358b31f80a088c87ce76a30d5e3b6e1964.tar.gz
opensim-SC_OLD-be3939358b31f80a088c87ce76a30d5e3b6e1964.tar.bz2
opensim-SC_OLD-be3939358b31f80a088c87ce76a30d5e3b6e1964.tar.xz
Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions