]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c77269 e6fa6da)
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 patch | diff1 | diff2 | blob | history
src/Makefile.in patch | diff1 | diff2 | blob | history

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