]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfeccce 997baef)
Merge commit '997baefd66008827aa144c651c166701de78b43a'
authorArtur Malabarba <bruce.connor.am@gmail.com>
Fri, 16 Oct 2015 21:24:41 +0000 (22:24 +0100)
committerArtur Malabarba <bruce.connor.am@gmail.com>
Fri, 16 Oct 2015 21:24:41 +0000 (22:24 +0100)
1  2 
packages/beacon/Readme.org patch | diff1 | diff2 | blob | history
packages/beacon/beacon.el patch | diff1 | diff2 | blob | history

diff --cc packages/beacon/Readme.org
Simple merge
diff --cc packages/beacon/beacon.el
Simple merge