diff options
| author | Melanie | 2012-04-11 23:35:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-11 23:35:27 +0100 |
| commit | 4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753 (patch) | |
| tree | 28253aa39e6bf11e8f814d6818f727e5f27eb036 /OpenSim/Data/Resources/OpenSim.Data.addin.xml | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | HGFriendsModule: Type casts to fix compile error (diff) | |
| download | opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.zip opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.gz opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.bz2 opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
Diffstat (limited to 'OpenSim/Data/Resources/OpenSim.Data.addin.xml')
0 files changed, 0 insertions, 0 deletions