diff options
| author | Melanie | 2012-06-26 17:35:55 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-26 17:35:55 +0100 |
| commit | 7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9 (patch) | |
| tree | 5492a786c85a7edd63fb8ad0c3c6f1da8d700741 /bin/C5.dll | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | When attachments are being saved and deleted for a closing root agent, delete... (diff) | |
| download | opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.zip opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.gz opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.bz2 opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/C5.dll')
0 files changed, 0 insertions, 0 deletions