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