[hamradio-commits] [linpsk] 04/07: Merge tag 'upstream/1.2'
Iain Learmonth
irl-guest at moszumanska.debian.org
Sun May 3 19:57:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository linpsk.
commit f270480046bc3fc5bf704d75b6c45e5a1d87d219
Merge: 8883382 799f6ad
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Sun May 3 20:29:20 2015 +0100
Merge tag 'upstream/1.2'
Upstream version 1.2
ChangeLog | 9 +-
README | 10 +-
gui/.directory | 3 -
gui/addmacro.cpp | 83 +-
gui/addmacro.h | 33 +-
gui/addmacro.ui | 446 ++--
gui/controlpanel.cpp | 98 +
gui/controlpanel.h | 50 +
gui/controlpanel.ui | 122 +
{src => gui}/crxdisplay.cpp | 218 +-
{src => gui}/crxdisplay.h | 89 +-
gui/crxdisplay.ui | 336 +++
src/crecording.cpp => gui/ctxdisplay.cpp | 61 +-
src/crecording.h => gui/ctxdisplay.h | 37 +-
gui/ctxdisplay.ui | 119 +
gui/deletemacro.cpp | 85 +-
gui/deletemacro.h | 27 +-
gui/deletemacro.ui | 325 +--
gui/editmacro.cpp | 91 +-
gui/editmacro.h | 27 +-
gui/editmacro.ui | 89 +-
gui/generalsettings.cpp | 105 +-
gui/generalsettings.h | 2 +
gui/generalsettings.ui | 315 ++-
gui/gui.pro | 50 +-
{src => gui}/linpsk.cpp | 590 ++---
{src => gui}/linpsk.h | 57 +-
gui/linpsk.ui | 658 +++++
gui/macrocontrol.cpp | 105 +
gui/{editmacro.h => macrocontrol.h} | 47 +-
gui/macrocontrol.ui | 130 +
gui/qsodata.cpp | 117 +-
gui/qsodata.h | 54 +-
gui/qsodata.ui | 3929 ++++++++++++++++--------------
gui/renamemacro.cpp | 40 +-
gui/renamemacro.h | 23 +-
gui/spectrumdisplay.cpp | 159 ++
{src => gui}/spectrumdisplay.h | 46 +-
gui/spectrumdisplay.ui | 211 ++
gui/txwindow.cpp | 194 ++
gui/{editmacro.h => txwindow.h} | 54 +-
gui/txwindow.ui | 110 +
linpsk.pro | 21 +-
src/cdemodulator.cpp | 5 -
src/cdemodulator.h | 7 +-
src/cledbutton.cpp | 2 -
src/constants.h | 286 ++-
src/controlpanel.cpp | 76 -
src/controlpanel.h | 43 -
src/cpskdemodulator.cpp | 271 +--
src/crxchannel.cpp | 4 +
src/crxchannel.h | 5 +-
src/crxwindow.cpp | 48 +-
src/crxwindow.h | 9 +-
src/csound.cpp | 96 +-
src/csound.h | 1 +
src/csquelch.cpp | 40 +-
src/csquelch.h | 2 +-
src/ctrigger.cpp | 68 -
src/ctxbuffer.cpp | 20 +-
src/ctxbuffer.h | 1 +
src/ctxwindow.cpp | 292 ---
src/ctxwindow.h | 71 -
src/frequencyselect.cpp | 2 +-
src/frequencyselect.h | 1 -
src/macros.cpp | 259 --
src/macros.h | 61 -
src/macrowindow.cpp | 135 -
src/macrowindow.h | 53 -
src/mfskdemodulator.cpp | 3 -
src/parameter.cpp | 14 +-
src/parameter.h | 12 +-
src/processlogdata.cpp | 23 +-
src/pskmodulator.cpp | 4 +-
src/pskmodulator.h | 1 -
src/rttydemodulator.cpp | 0
src/rttydemodulator.h | 0
src/spectrumdisplay.cpp | 354 ---
src/spectrumwindow.cpp | 194 ++
src/spectrumwindow.h | 57 +
src/src.pro | 58 +-
src/tabwidget.cpp | 11 +
src/tabwidget.h | 19 +
src/waterfallwindow.cpp | 89 +
src/{ctrigger.h => waterfallwindow.h} | 56 +-
src/waveinput.cpp | 19 +-
gui/editmacro.h => templates/cpp | 36 -
gui/editmacro.h => templates/h | 36 -
88 files changed, 7030 insertions(+), 5189 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/linpsk.git
More information about the pkg-hamradio-commits
mailing list