opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2013-03-31 20:56:13 +0100
committer	Melanie	2013-03-31 20:56:13 +0100
commit	ae833af3a919432f48bf1f91b34725999fd4be54 (patch)
tree	15b22b410913d2dbaf83e573d2ba93b0b23e4f1a /OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
parent	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parent	In the flotasm asset cache, if we get a request for a file that we're activel... (diff)
download	opensim-SC-ae833af3a919432f48bf1f91b34725999fd4be54.zip opensim-SC-ae833af3a919432f48bf1f91b34725999fd4be54.tar.gz opensim-SC-ae833af3a919432f48bf1f91b34725999fd4be54.tar.bz2 opensim-SC-ae833af3a919432f48bf1f91b34725999fd4be54.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs')

0 files changed, 0 insertions, 0 deletions