diff options
| author | Melanie | 2012-01-24 00:36:42 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-24 00:36:42 +0000 |
| commit | 07ad821157a5e86d706114645eee1339a6ba51ae (patch) | |
| tree | c2cf6cdd466fc6e492e95a852b94cbbc7604ee83 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | Change Telehubs to store only the data that is really needed and not (diff) | |
| download | opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.zip opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.tar.gz opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.tar.bz2 opensim-SC_OLD-07ad821157a5e86d706114645eee1339a6ba51ae.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions