[Pkg-running-devel] [antpm] 02/06: Merge tag 'upstream/v1.18'

Kristof Ralovich ralovich-guest at moszumanska.debian.org
Sat Mar 12 23:53:31 UTC 2016


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

ralovich-guest pushed a commit to branch master
in repository antpm.

commit 53be8af6eaf55b3dc4aceb30b3799549172f6c10
Merge: 60c1e50 27e207e
Author: RALOVICH, Kristof <tade60 at freemail.hu>
Date:   Sat Mar 12 23:05:39 2016 +0100

    Merge tag 'upstream/v1.18'
    
    Conflicts:
    	.travis.yml

 docs/maintainer.txt              |  25 ++--
 scripts/debian/changelog         |  44 +++++++
 scripts/make-tarball             |   4 +-
 src/AntChannel.cpp               |   6 +
 src/AntFr310XT.cpp               | 149 +++++++++++++++++++--
 src/AntMessage.cpp               |  22 ++++
 src/AntMessage.hpp               |   6 +
 src/AntMessenger.cpp             |  27 ++--
 src/CMakeLists.txt               |  25 ++--
 src/DeviceSettings.cpp           |   4 +-
 src/LazySingleton.hpp            |  15 +--
 src/Log.hpp                      |  18 ++-
 src/SerialTty.hpp                |   2 +-
 src/SerialUsb.cpp                | 271 ++++++++++++++++++++++++---------------
 src/SerialUsb.hpp                |   2 +-
 src/VERSION                      |   2 +-
 src/antdefs.hpp                  |   4 +-
 src/antpm-downloader.cpp         |   6 +-
 src/antpm-fit2gpx.cpp            |  12 +-
 src/antpm-usbmon2ant.cpp         |  13 +-
 src/common.cpp                   |   2 +-
 src/tests/lq1.cpp                |  15 +--
 src/tests/sm1.cpp                |   9 +-
 src/tests/testDateTime.cpp       |  13 +-
 src/tests/testDeviceSettings.cpp |  11 +-
 25 files changed, 467 insertions(+), 240 deletions(-)

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



More information about the Pkg-running-devel mailing list