[med-svn] [jaligner] 03/03: Merge tag 'upstream/1.0+dfsg'

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch master
in repository jaligner.

commit d1390d0828b55161ecb8cc193f6d32a713249169
Merge: dae5231 cec480f
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Fri Aug 28 09:23:41 2015 -0700

    Merge tag 'upstream/1.0+dfsg'
    
    Upstream version 1.0+dfsg

 debian/source/include-binaries         |   9 +++++++++
 src/jaligner/ui/images/gifs/about.gif  | Bin 644 -> 0 bytes
 src/jaligner/ui/images/gifs/close.gif  | Bin 254 -> 0 bytes
 src/jaligner/ui/images/gifs/copy.gif   | Bin 288 -> 0 bytes
 src/jaligner/ui/images/gifs/cut.gif    | Bin 652 -> 0 bytes
 src/jaligner/ui/images/gifs/delete.gif | Bin 208 -> 0 bytes
 src/jaligner/ui/images/gifs/open.gif   | Bin 228 -> 0 bytes
 src/jaligner/ui/images/gifs/paste.gif  | Bin 298 -> 0 bytes
 src/jaligner/ui/images/gifs/print.gif  | Bin 293 -> 0 bytes
 src/jaligner/ui/images/gifs/save.gif   | Bin 255 -> 0 bytes
 10 files changed, 9 insertions(+)

diff --cc debian/source/include-binaries
index 0000000,0000000..9378eed
new file mode 100644
--- /dev/null
+++ b/debian/source/include-binaries
@@@ -1,0 -1,0 +1,9 @@@
++debian/images/about.gif
++debian/images/close.gif
++debian/images/copy.gif
++debian/images/cut.gif
++debian/images/delete.gif
++debian/images/open.gif
++debian/images/paste.gif
++debian/images/print.gif
++debian/images/save.gif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jaligner.git