diff options
| author | Melanie | 2012-03-04 16:23:19 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-04 16:23:19 +0000 |
| commit | 6338996f87ca1314c493709d42b1c606f5688676 (patch) | |
| tree | 5ea7bd2c640390c19ef787360d71ac97851db43f /OpenSim/Framework/ConfigSettings.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add WebProfiles config to other config example (diff) | |
| download | opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.zip opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.gz opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.bz2 opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to 'OpenSim/Framework/ConfigSettings.cs')
0 files changed, 0 insertions, 0 deletions