]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8136370 6abd4f4)
Merge commit '6abd4f4fe740054d433d928d90fb1671cce6719c'
authorArtur Malabarba <bruce.connor.am@gmail.com>
Mon, 7 Sep 2015 20:27:35 +0000 (21:27 +0100)
committerArtur Malabarba <bruce.connor.am@gmail.com>
Mon, 7 Sep 2015 20:27:35 +0000 (21:27 +0100)
1  2 
packages/nameless/README.org patch | diff1 | diff2 | blob | history
packages/nameless/example-nameless.png patch | | diff2 | blob | history
packages/nameless/nameless.el patch | diff1 | diff2 | blob | history

diff --cc packages/nameless/README.org
Simple merge
diff --cc packages/nameless/example-nameless.png
index 0000000000000000000000000000000000000000,38bea2d5a0f30031e371b2e6e8554a9b7a5c9c67..38bea2d5a0f30031e371b2e6e8554a9b7a5c9c67
mode 000000,100644..100644
Binary files differ
diff --cc packages/nameless/nameless.el
Simple merge