]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: dc6aff3 a310be9)
minor conflict between upstream and local
authorJoakim Verona <joakim@verona.se>
Thu, 23 Feb 2012 17:11:38 +0000 (18:11 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 23 Feb 2012 17:11:38 +0000 (18:11 +0100)
commit286c3fc8cad641cd607dbfa5cca4868603797924
tree3bf98246eb58dff28c82f0194e66609472856c4atree
parentdc6aff34d82f07959eae182f2ad2d30701ea07e6commit | diff
parenta310be98ac999bd409bc21274072633aa2f2a9c0commit | diff
minor conflict between upstream and local
README.xwidget diff1 | diff2 | blob | history