diff options
| author | Melanie | 2013-03-05 23:57:53 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-05 23:57:53 +0000 |
| commit | 81552f41c601017f43061d923eba393b9f85a7b3 (patch) | |
| tree | 5d6c3aba0f72941c06b47eaae6f4cd0301b60b23 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | minor: Fix mono compiler warning in MonitorModule (diff) | |
| download | opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.zip opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.gz opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.bz2 opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
0 files changed, 0 insertions, 0 deletions