[Python-modules-commits] [python-gammu] 02/07: Merge tag 'upstream/2.1'

[Michal Cihar]

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

nijel pushed a commit to branch master
in repository python-gammu.

commit b9c207987b64ab11f8eb84096ccee721432b5a32
Merge: 9376f9e 6bd7cd8
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Apr 15 09:43:34 2015 +0200

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1
    
    Conflicts:
    	python_gammu.egg-info/PKG-INFO
    	python_gammu.egg-info/SOURCES.txt

 MANIFEST.in                                |   2 +
 NEWS.rst                                   |  14 ++
 PKG-INFO                                   |   5 +-
 README.rst                                 |   3 +
 gammu/src/convertors/base.c                |   4 +
 gammu/src/convertors/diverts.c             |   2 +-
 gammu/src/convertors/memory.c              |   7 +-
 gammu/src/convertors/sms.c                 |   3 +
 gammu/src/convertors/string.c              |   2 +-
 gammu/src/convertors/wap.c                 |  19 ++-
 gammu/src/gammu.c                          |  21 ++-
 PKG-INFO => python_gammu.egg-info/PKG-INFO |   5 +-
 python_gammu.egg-info/SOURCES.txt          | 109 +++++++++++++++
 setup.py                                   |   2 +-
 test/data/gammu-dummy/calendar/2           |  15 +++
 test/data/gammu-dummy/calendar/22          |  10 ++
 test/data/gammu-dummy/fs/dir2/dir2-5/file1 |   1 +
 test/data/gammu-dummy/fs/dir2/dir2-5/file2 |   1 +
 test/data/gammu-dummy/fs/dir2/dir2-5/file3 |   1 +
 test/data/gammu-dummy/fs/dir2/dir2-5/file4 |   1 +
 test/data/gammu-dummy/fs/dir2/file5        |   1 +
 test/data/gammu-dummy/fs/file5             |   1 +
 test/data/gammu-dummy/pbk/ME/1             |   6 +
 test/data/gammu-dummy/pbk/ME/101           |  16 +++
 test/data/gammu-dummy/pbk/ME/103           | 206 +++++++++++++++++++++++++++++
 test/data/gammu-dummy/pbk/SM/1             |  20 +++
 test/data/gammu-dummy/sms/1/1              |   8 ++
 test/data/gammu-dummy/sms/2/10             |   9 ++
 test/data/gammu-dummy/sms/3/42             |   8 ++
 test/data/gammu-dummy/sms/4/15             |   9 ++
 test/data/gammu-dummy/sms/4/20             |  25 ++++
 test/data/gammu-dummy/sms/4/21             |  25 ++++
 test/data/gammu-dummy/todo/22              |  14 ++
 test/data/gammu-dummy/todo/3               |  18 +++
 test/test_dummy.py                         |   2 +-
 35 files changed, 575 insertions(+), 20 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-gammu.git