aboutsummaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
masterMerge commit 'cf5da99'Wolfgang Wiedmeyer9 years
upstreamUpdate FMJ and libjitsi (Closes #160)Ingo Bauersachs10 years