Philip Heron 65bb16a19f Merge commit 'v3.21.12' into upstream_merge ... Conflicts: ChangeLog configure.ac doc/guide.txt po/dl-fldigi.pot po/fr.po src/Makefile.am src/combo/combo.cxx src/cw_rtty/rtty.cxx src/dialogs/confdialog.cxx src/dialogs/confdialog.fl src/dialogs/fl_digi.cxx src/dialogs/guide.cxx src/globals/globals.cxx src/include/adif_io.h src/include/confdialog.h src/include/configuration.h src/include/fl_digi.h src/include/lgbook.h src/logbook/adif_io.cxx src/logbook/lgbook.cxx src/logbook/lgbook.fl src/logbook/logsupport.cxx src/logbook/textio.cxx src/logger/logger.cxx src/logger/rx_extract.cxx src/misc/macros.cxx src/misc/status.cxx src/misc/xmlrpc.cxx src/soundcard/sound.cxx src/trx/modem.cxx		2011-07-20 16:46:01 +01:00
..
mac	added string_limit to xml to allow for super long strings - by default it is 100and <string_limit> is not required in the xml but will be take	2010-07-15 23:50:00 +01:00
win32	Merge commit 'v3.21.12' into upstream_merge	2011-07-20 16:46:01 +01:00
dl-fldigi-hab.desktop	Icon was renamed, update desktop files.	2010-06-20 01:30:26 +01:00
dl-fldigi.desktop	Icon was renamed, update desktop files.	2010-06-20 01:30:26 +01:00
dl-fldigi.xpm	Stop dl-fldigi files conflicting with fldigi package.	2010-06-20 01:24:57 +01:00
flarq.desktop	Merge flarq	2009-05-26 20:01:38 +01:00
flarq.xpm	Merge flarq	2009-05-26 20:01:38 +01:00
fldigi-psk.png	Upstream version 2.08c	2008-01-10 18:02:24 +00:00
fldigi-rtty.png	Upstream version 2.08c	2008-01-10 18:02:24 +00:00
fldigi.desktop	Upstream version 2.08G	2008-01-25 23:11:48 +00:00