diff options
| author | Melanie | 2012-10-03 17:40:11 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-03 17:40:11 +0100 |
| commit | bf565e9747bfd411ac6d2405bdbd26b519735dd3 (patch) | |
| tree | 84dc5992afbbdc5795060957963cfc76949a978c /OpenSim/Services/Friends/FriendsServiceBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix a viewer crash issue (diff) | |
| download | opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.zip opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.tar.gz opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.tar.bz2 opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services/Friends/FriendsServiceBase.cs')
0 files changed, 0 insertions, 0 deletions