]> git.sesse.net Git - movit/commitdiff
Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 16 Mar 2014 18:36:25 +0000 (19:36 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 16 Mar 2014 18:37:16 +0000 (19:37 +0100)
Conflicts:
Makefile.in
configure.ac


No differences found