]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b62400 c44ef65)
Merge commit 'c44ef65515f50bd38304a6f50adebc984fb8e431'
authorArtur Malabarba <bruce.connor.am@gmail.com>
Thu, 9 Apr 2015 16:23:57 +0000 (17:23 +0100)
committerArtur Malabarba <bruce.connor.am@gmail.com>
Thu, 9 Apr 2015 16:23:57 +0000 (17:23 +0100)
1  2 
packages/spinner/README.org patch | diff1 | diff2 | blob | history
packages/spinner/all-spinners.gif patch | | diff2 | blob | history
packages/spinner/some-spinners.gif patch | diff1 | diff2 | blob | history
packages/spinner/spinner.el patch | diff1 | diff2 | blob | history

diff --cc packages/spinner/README.org
Simple merge
diff --cc packages/spinner/all-spinners.gif
index 0000000000000000000000000000000000000000,5540b685aa97a338f9c2e158491ecb618da4f581..5540b685aa97a338f9c2e158491ecb618da4f581
mode 000000,100644..100644
Binary files differ
diff --cc packages/spinner/some-spinners.gif
index a8028e778306dfe9db1f70a9e41744b501d96c6b,a8028e778306dfe9db1f70a9e41744b501d96c6b..a8028e778306dfe9db1f70a9e41744b501d96c6b
Binary files differ
diff --cc packages/spinner/spinner.el
Simple merge