diff options
| author | lcc | 2010-04-10 23:52:10 +0200 |
|---|---|---|
| committer | lcc | 2010-04-10 23:52:10 +0200 |
| commit | 7ecd9b3f1ac4556125a35ab384224b2ca0401a11 (patch) | |
| tree | 63151eb7e3693485af9db8947f2004f586062ca5 /OpenSim/Framework/ForeignUserProfileData.cs | |
| parent | Adding ColdStart event (diff) | |
| parent | guarantee that a script engine's GetScriptErrors() will not be called (diff) | |
| download | opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.zip opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.gz opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.bz2 opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
resolved
Conflicts:
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
Diffstat (limited to 'OpenSim/Framework/ForeignUserProfileData.cs')
0 files changed, 0 insertions, 0 deletions