]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87f211d bb13df5)
Merge commit 'bb13df55aa357538f95c3a8a28cac18533f5d164'
authorrocky <rocky@gnu.org>
Tue, 31 Mar 2015 10:05:05 +0000 (06:05 -0400)
committerrocky <rocky@gnu.org>
Tue, 31 Mar 2015 10:05:05 +0000 (06:05 -0400)
1  2 
packages/test-simple/Makefile.am patch | diff1 | diff2 | blob | history
packages/test-simple/test-simple.el patch | diff1 | diff2 | blob | history

diff --cc packages/test-simple/Makefile.am
Simple merge
diff --cc packages/test-simple/test-simple.el
Simple merge