Merge branch 'epoxy' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:21:54 +0000 (00:21 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:21:54 +0000 (00:21 +0100)
Conflicts:
Makefile.in
movit.pc.in

1  2 
Makefile.in

diff --cc Makefile.in
Simple merge