diff options
| author | Melanie | 2011-10-11 21:28:23 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 21:28:23 +0100 |
| commit | 8fac7c065088d9861ba2ff772fde7f2e9c8d1003 (patch) | |
| tree | 715c078c3a0ad1298b6b560cf31c2d445c22700a /Makefile | |
| parent | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge (diff) | |
| parent | Correctly create a freshly created estate owner's default items and avatar en... (diff) | |
| download | opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.zip opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.gz opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.bz2 opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.xz | |
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions