]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'trunk' into xwidget
authorJoakim Verona <joakim@verona.se>
Fri, 14 Jun 2013 21:54:26 +0000 (23:54 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 14 Jun 2013 21:54:26 +0000 (23:54 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge