[hamradio-commits] [pyqso] 02/03: Merge tag 'upstream/0.2'

[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 6be119294e7884b710e8ad0a010666126ed65685
Merge: fbd23ac d6512dc
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon Mar 23 21:39:08 2015 +0000

    Merge tag 'upstream/0.2'
    
    Upstream version 0.2

 .gitignore                                |   4 +
 .travis.yml                               |  24 +++
 CHANGELOG.md                              |  50 ++++++
 Makefile                                  |  32 ++--
 README.md                                 |  23 ++-
 bin/pyqso                                 |  14 +-
 doc/images/awards.png                     | Bin 11921 -> 0 bytes
 doc/images/dx_cluster.png                 | Bin 49197 -> 0 bytes
 doc/images/edit_record.png                | Bin 42003 -> 0 bytes
 doc/images/log_with_awards.png            | Bin 59371 -> 0 bytes
 doc/manual.tex                            | 258 ----------------------------
 docs/Makefile                             | 180 ++++++++++++++++++++
 docs/make.bat                             | 242 +++++++++++++++++++++++++++
 docs/source/conf.py                       | 269 ++++++++++++++++++++++++++++++
 docs/source/getting_started.rst           |  96 +++++++++++
 docs/source/images/awards.png             | Bin 0 -> 11055 bytes
 docs/source/images/dx_cluster.png         | Bin 0 -> 62219 bytes
 docs/source/images/edit_record.png        | Bin 0 -> 44291 bytes
 {doc => docs/source}/images/grey_line.png | Bin
 docs/source/images/logbook.png            | Bin 0 -> 140698 bytes
 docs/source/index.rst                     |  20 +++
 docs/source/introduction.rst              |  67 ++++++++
 docs/source/log_management.rst            |  76 +++++++++
 docs/source/preferences.rst               |  43 +++++
 docs/source/pyqso.rst                     | 134 +++++++++++++++
 docs/source/record_management.rst         |  71 ++++++++
 docs/source/toolbox.rst                   |  58 +++++++
 pyqso/adif.py                             | 107 ++++++++++--
 pyqso/auxiliary_dialogs.py                |   9 +-
 pyqso/awards.py                           |   3 +-
 pyqso/callsign_lookup.py                  |  47 +++++-
 pyqso/dx_cluster.py                       |  10 +-
 pyqso/grey_line.py                        |   6 +-
 pyqso/log.py                              |  51 +++---
 pyqso/log_name_dialog.py                  |   3 +-
 pyqso/logbook.py                          |  61 ++++++-
 pyqso/menu.py                             |   3 +-
 pyqso/preferences_dialog.py               |  80 +++++----
 pyqso/record_dialog.py                    |  31 ++--
 pyqso/telnet_connection_dialog.py         |   3 +-
 pyqso/toolbar.py                          |   3 +-
 pyqso/toolbox.py                          |   3 +-
 setup.py                                  |   8 +-
 43 files changed, 1685 insertions(+), 404 deletions(-)

diff --cc .gitignore
index a31c884,e625f77..66171a3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,6 @@@
 +.pc/
  *.pyc
+ pyqso.debug
+ build/
+ docs/build
+ ADIF.test*.adi

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