dl-fldigi/data/win32
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
..
flarq.ico
fldigi.ico
fldigi.nsi Merge commit 'v3.21.12' into upstream_merge 2011-07-20 16:46:01 +01:00