diff options
| author | Melanie | 2012-12-07 03:49:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-07 03:49:04 +0000 |
| commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
| tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
0 files changed, 0 insertions, 0 deletions