]> git.sesse.net Git - movit/commitdiff
Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 17 Mar 2014 00:46:29 +0000 (01:46 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 17 Mar 2014 00:46:29 +0000 (01:46 +0100)
Conflicts:
Makefile.in
movit.pc.in


No differences found