diff options
| author | Melanie | 2013-05-11 02:35:26 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 02:35:26 +0100 |
| commit | 13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch) | |
| tree | 41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/Services/UserAccountService/UserAccountServiceBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2 opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Services/UserAccountService/UserAccountServiceBase.cs')
0 files changed, 0 insertions, 0 deletions