]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' into xwidget_mvp
authorJoakim Verona <joakim@verona.se>
Thu, 19 Mar 2015 22:35:34 +0000 (23:35 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 19 Mar 2015 22:35:34 +0000 (23:35 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge