diff options
| author | Melanie | 2012-03-22 20:42:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:42:06 +0000 |
| commit | 76a54f4680f9658edf1109fb2c681c965fe58614 (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Region/Framework/Interfaces/IVoiceModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change a false false to be truly true - or is this statement false? (diff) | |
| download | opensim-SC-76a54f4680f9658edf1109fb2c681c965fe58614.zip opensim-SC-76a54f4680f9658edf1109fb2c681c965fe58614.tar.gz opensim-SC-76a54f4680f9658edf1109fb2c681c965fe58614.tar.bz2 opensim-SC-76a54f4680f9658edf1109fb2c681c965fe58614.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IVoiceModule.cs')
0 files changed, 0 insertions, 0 deletions