]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'jave-xwidget' into xwidget
authorGrégoire Jadi <gregoire.jadi@gmail.com>
Wed, 12 Jun 2013 15:06:09 +0000 (17:06 +0200)
committerGrégoire Jadi <gregoire.jadi@gmail.com>
Wed, 12 Jun 2013 15:06:09 +0000 (17:06 +0200)
1  2 
configure.ac
src/Makefile.in

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.in
Simple merge