diff options
| author | Melanie | 2012-07-05 22:17:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-05 22:17:39 +0100 |
| commit | 5776351f6abd4ca8cca7344b26ab989425c67687 (patch) | |
| tree | fe0c0355ceb25db47125525b9b72d2077cc3c29f /bin/inventory | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: add client name to various login service log messages to disambiguate ... (diff) | |
| download | opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.zip opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.tar.gz opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.tar.bz2 opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/inventory')
0 files changed, 0 insertions, 0 deletions