diff options
author | Melanie | 2012-03-23 14:24:55 +0000 |
---|---|---|
committer | Melanie | 2012-03-23 14:24:55 +0000 |
commit | 9a67baae2162faf0f2c3d77390c855a5659a167e (patch) | |
tree | 63e7ad9d3ce24731c1757a8c7197b1e16a873e52 /OpenSim/Framework | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
parent | fix yield prolog so it compiles with mono 2.11 there has been a bugzilla (diff) | |
download | opensim-SC-9a67baae2162faf0f2c3d77390c855a5659a167e.zip opensim-SC-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.gz opensim-SC-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.bz2 opensim-SC-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions