diff options
| author | Melanie | 2012-09-16 04:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:11:20 +0100 |
| commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
| tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/Framework/Configuration | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'OpenSim/Framework/Configuration')
0 files changed, 0 insertions, 0 deletions