diff options
| author | Melanie | 2012-03-26 14:22:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-26 14:22:49 +0100 |
| commit | da9743d1d7a6cefdded6debf87767c73cbc24ca1 (patch) | |
| tree | 379ba8adc49565c59402c372437a27f048f31b53 /OpenSim/Region/CoreModules/Avatar/Friends | |
| parent | Fix the omission on the interface declaration (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-da9743d1d7a6cefdded6debf87767c73cbc24ca1.zip opensim-SC-da9743d1d7a6cefdded6debf87767c73cbc24ca1.tar.gz opensim-SC-da9743d1d7a6cefdded6debf87767c73cbc24ca1.tar.bz2 opensim-SC-da9743d1d7a6cefdded6debf87767c73cbc24ca1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
0 files changed, 0 insertions, 0 deletions