aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
diff options
context:
space:
mode:
authorMelanie2012-02-21 10:20:56 +0000
committerMelanie2012-02-21 10:20:56 +0000
commit03e7bc1526d24efe23f61f6a8dee88010ccfdb8c (patch)
treec2c2afef43a697dec1373ef5987f7d163031e5e2 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentBoth 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff)
downloadopensim-SC_OLD-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.zip
opensim-SC_OLD-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.gz
opensim-SC_OLD-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.bz2
opensim-SC_OLD-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.xz
Merge branch 'master' into careminster
Conflicts:
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
0 files changed, 0 insertions, 0 deletions