diff options
| author | Melanie | 2012-10-07 03:03:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-07 03:03:24 +0100 |
| commit | 9be2d5c77da8c2fc6c953e26a8b1412642588eb2 (patch) | |
| tree | 58ab78fef437008c69e0689b5892e8632d31efc0 /OpenSim/Services/HypergridService/HGInstantMessageService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.zip opensim-SC-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.tar.gz opensim-SC-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.tar.bz2 opensim-SC-9be2d5c77da8c2fc6c953e26a8b1412642588eb2.tar.xz | |
Fix merge issues
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInstantMessageService.cs')
0 files changed, 0 insertions, 0 deletions