diff options
| author | Melanie | 2013-02-23 20:37:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-23 20:37:09 +0000 |
| commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
| tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Framework/OSChatMessage.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | More clarification on the [Groups] section (diff) | |
| download | opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Framework/OSChatMessage.cs')
0 files changed, 0 insertions, 0 deletions