aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-12-071-33/+0
|\
| * Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-12-076-38/+112
| |\
| * | Remove old Freeswitch configurationsMelanie2010-12-071-33/+0
* | | Allow TPing multiple people in the friends list in one go.Melanie2010-12-071-5/+10
| |/ |/|
* | Update calling card interfaceMelanie2010-12-071-1/+1
* | Add the interface needed to revive calling cardsMelanie2010-12-072-0/+26
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-12-0728-215/+243
|\ \ | |/
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-12-0627-214/+242
| |\
| | * Fixed some inconsistency with trailing /. Made debug messages consistent. Cha...Diva Canto2010-12-0511-35/+47
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0579-1150/+2402
| | |\
| | | * Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-031-19/+6
| | | |\
| | | | * Simplify updating of agent inventory assets. Make newly created asset IDsMelanie2010-12-041-19/+6
| | | * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-034-170/+158
| | | |\ \ | | | | |/
| | | * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-032-0/+93
| | | |\ \
| | | * \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-032-61/+54
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-031-0/+83
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-032-2/+11
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-034-62/+123
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-031-2/+2
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-024-8/+28
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-013-19/+50
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-015-121/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-014-1/+28
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-2933-410/+1080
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-281-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-281-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-271-10/+76
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-271-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-261-21/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-261-2/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-261-0/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-266-170/+149
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-261-15/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-261-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-263-17/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-261-2/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-241-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-246-77/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-241-2/+60
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-242-0/+243
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-241-2/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2317-99/+307
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-231-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-233-3/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-231-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-233-1/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-225-66/+241
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-222-15/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-221-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-221-6/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \