BranchCommit messageAuthorAge
masterinstantiate the media manager only if the protocol support calls (fdo #30594)Guillaume Desmottes9 years
protocol-avatar-propsAdded avatar protocol props to protocols test.Eitan Isaacson9 years
AgeCommit messageAuthorFilesLines
2010-10-18instantiate the media manager only if the protocol support calls (fdo #30594)HEADmasterGuillaume Desmottes1-3/+7
2010-09-22Merge branch 'contact-list'Simon McVittie6-364/+441
2010-09-22explain why a suspicious-looking use of purple_group_new is actually OKSimon McVittie1-0/+2
2010-09-22Use sync_dbus instead of NIHing itSimon McVittie1-1/+1
2010-09-22Merge branch 'telepathy-haze-0.4'Simon McVittie5-8/+95
2010-09-22Merge branches '04-trivia' and '04-self-aliasing' into telepathy-haze-0.4Simon McVittie5-13/+100
2010-09-22Make libpurple 2.7 mandatory (but still allow disabling media calls)Simon McVittie1-3/+3
2010-09-22Fix regression test for Protocol now that it's stableSimon McVittie1-1/+1
2010-09-22Merge branch 'protocol'Simon McVittie13-626/+1242
2010-09-22Merge branch 'get-bus'Simon McVittie7-18/+46