diff options
| author | Melanie | 2012-06-12 03:09:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-12 03:09:52 +0100 |
| commit | dfafb5ca1451a407eafa6fbdc0246d6bdb962531 (patch) | |
| tree | 62a3ba18f0ea09be7ec0bcbc3afdc701f592c7e6 /OpenSim/Region/Framework/Scenes/Border.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove accidental timeout left in during earlier debugging. Has been in sinc... (diff) | |
| download | opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.zip opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.gz opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.bz2 opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Border.cs')
0 files changed, 0 insertions, 0 deletions