[hamradio-commits] [qsstv] 05/05: Merge branch 'master' of git+ssh://alioth.debian.org/git/pkg-hamradio/qsstv

[Dave Hibberd]

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

hibby-guest pushed a commit to branch master
in repository qsstv.

commit ab84e68cfe8d31e042439aba164e4ccb3c988104
Merge: 68f891a 5aea5b5
Author: Hibby <d at vehibberd.com>
Date:   Wed Jun 1 22:01:53 2016 +0100

    Merge branch 'master' of git+ssh://alioth.debian.org/git/pkg-hamradio/qsstv

 debian/missing-sources/jquery.js         | 68 ++++++++++++++++++++++++++++++++
 debian/patches/Fix_Binary_Spelling.quilt |  2 +-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --cc debian/patches/Fix_Binary_Spelling.quilt
index bc246c7,04cd37e..64c5c2a
--- a/debian/patches/Fix_Binary_Spelling.quilt
+++ b/debian/patches/Fix_Binary_Spelling.quilt
@@@ -13,12 -13,3 +13,12 @@@ Last-Update: 2016-05-2
                                + "\n Last Modified: " + fi.lastModified().toString()
                                ,QMessageBox::Ok);
     }
++
 +@@ -526,7 +526,7 @@
 +   {
 +     QMessageBox::information(this,"Image Properties",
 +                              " Image width:   " + QString::number(orgWidth)
 +-                             + "\n Image heigth:  " + QString::number(orgHeight)
 ++                             + "\n Image height:  " + QString::number(orgHeight)
 +                              ,QMessageBox::Ok);
 +   }
-  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/qsstv.git