]> code.delx.au - gnu-emacs/commitdiff
Merge branch 'master' into xwidget
authorJoakim Verona <joakim@verona.se>
Wed, 21 Jan 2015 23:05:27 +0000 (00:05 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Jan 2015 23:05:27 +0000 (00:05 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge