[Pkg-voip-commits] [twinkle] 01/06: Merge tag 'upstream/1.9.0+git20160321.0.64a0816+dfsg'
Peter Colberg
peter at colberg.org
Sat May 14 03:30:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
pc-guest pushed a commit to branch master
in repository twinkle.
commit 14c814d1c1ad4189c1a48936af48b36cfe6bfd5d
Merge: 3127838 8916774
Author: Peter Colberg <peter at colberg.org>
Date: Fri May 13 07:12:02 2016 -0400
Merge tag 'upstream/1.9.0+git20160321.0.64a0816+dfsg'
Upstream version 1.9.0+git20160321.0.64a0816+dfsg
.travis.yml | 16 +
CMakeLists.txt | 59 +-
NEWS | 2 +-
README.md | 7 +-
cmake/FindGsm.cmake | 17 +
data/twinkle.1 | 131 ++++
src/CMakeLists.txt | 45 +-
src/abstract_dialog.h | 2 +-
src/address_book.h | 2 +-
src/audio/audio_tx.h | 7 +-
src/auth.cpp | 2 +-
src/auth.h | 2 +-
src/dialog.h | 4 +-
src/events.cpp | 1 +
src/gui/CMakeLists.txt | 39 +-
src/gui/addresstablemodel.cpp | 5 -
src/gui/addresstablemodel.h | 5 +
src/gui/getaddressform.cpp | 39 +-
src/gui/gui.cpp | 9 +-
src/gui/historyform.cpp | 32 +-
src/gui/historyform.h | 3 +-
src/gui/historyform.ui | 20 +-
src/gui/incoming_call_popup.cpp | 16 +-
src/gui/incoming_call_popup.h | 8 +-
src/gui/lang/twinkle_cs.ts | 8 +-
src/gui/lang/twinkle_de.ts | 8 +-
src/gui/lang/twinkle_fr.ts | 8 +-
src/gui/lang/twinkle_nl.ts | 8 +-
src/gui/lang/twinkle_ru.ts | 1398 +++++++++++++++++----------------------
src/gui/lang/twinkle_sv.ts | 8 +-
src/gui/lang/twinkle_xx.ts | 8 +-
src/gui/main.cpp | 48 +-
src/gui/mphoneform.cpp | 2 +-
src/gui/mphoneform.h | 4 +-
src/gui/osd.cpp | 30 +-
src/gui/osd.h | 19 +-
src/gui/qml/ImageButton.qml | 2 +-
src/gui/qml/TextImageButton.qml | 2 +-
src/gui/qml/incoming_call.qml | 21 +-
src/gui/qml/osd.qml | 20 +-
src/gui/syssettingsform.cpp | 3 +-
src/gui/userprofileform.ui | 272 ++++----
src/gui/wizardform.ui | 2 +-
src/line.cpp | 9 +
src/line.h | 1 +
src/log.cpp | 2 +-
src/parser/challenge.cpp | 2 +-
src/parser/credentials.cpp | 2 +-
src/parser/hdr_privacy.h | 2 +-
src/parser/hdr_warning.h | 4 +-
src/parser/request.cpp | 24 +-
src/parser/request.h | 10 +-
src/parser/response.cpp | 0
src/parser/scanner.lxx | 2 +-
src/phone.cpp | 2 -
src/phone.h | 4 +-
src/phone_user.h | 2 +-
src/presence/buddy.h | 4 +-
src/stun/stun.cxx | 10 +-
src/stun/udp.h | 2 +-
src/sub_refer.cpp | 2 +-
src/subscription.cpp | 2 +-
src/subscription.h | 2 +-
src/sys_settings.cpp | 12 +-
src/sys_settings.h | 2 +-
src/userintf.cpp | 2 +-
src/utils/record_file.h | 8 +-
twinkle.desktop.in | 42 +-
twinkle_config.h.in | 1 +
69 files changed, 1283 insertions(+), 1216 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git
More information about the Pkg-voip-commits
mailing list