[hamradio-commits] [pyqso] 03/09: Merge tag 'upstream/0.1+git2015020701'

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository pyqso.

commit 49fa194e1bc7c30bce77de16bc64b1d47c9b6ff1
Merge: 1019e83 e2da7ee
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sat Feb 7 23:25:20 2015 +0000

    Merge tag 'upstream/0.1+git2015020701'
    
    Upstream version 0.1+git2015020701
    
    Conflicts:
    	.gitignore

 .gitignore                  |   1 +
 bin/pyqso                   |  39 +++++----
 doc/manual.tex              |   2 +-
 pyqso/adif.py               |  25 ++++--
 pyqso/callsign_lookup.py    |  42 ++++++++-
 pyqso/grey_line.py          |   1 +
 pyqso/logbook.py            |  83 +++++++++++-------
 pyqso/menu.py               |  21 +++--
 pyqso/preferences_dialog.py | 201 ++++++++++++++++++++++++++++++++++----------
 pyqso/record_dialog.py      | 143 ++++++++++++++++++++++++-------
 pyqso/toolbar.py            |  15 +++-
 setup.py                    |   2 +-
 12 files changed, 434 insertions(+), 141 deletions(-)

diff --cc .gitignore
index 224e7f0,0d20b64..a31c884
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
 +.pc/
+ *.pyc

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