James Coxon
|
14b29f302b
|
fixed merge error
|
2013-12-08 12:08:09 +00:00 |
|
James Coxon
|
a2002acfd8
|
Merge tag 'v3.21.77' of git://git.berlios.de/fldigi
Conflicts:
ChangeLog
configure.ac
po/dl-fldigi.pot
po/es.po
po/fr.po
po/it.po
po/pl.po
src/dialogs/confdialog.cxx
src/dialogs/confdialog.fl
src/include/confdialog.h
src/main.cxx
src/throb/throb.cxx
src/trx/modem.cxx
|
2013-11-29 16:59:36 +00:00 |
|
James Coxon
|
1d7d18fabd
|
Merge tag 'v3.21.73' of git://git.berlios.de/fldigi
Conflicts:
doc/Makefile.am
po/dl-fldigi.pot
po/es.po
po/fr.po
po/it.po
po/pl.po
src/Makefile.am
src/dialogs/fl_digi.cxx
src/include/configuration.h
src/include/fl_digi.h
src/rigcontrol/rigio.cxx
|
2013-11-29 16:23:07 +00:00 |
|
James Coxon
|
dbeae97f0f
|
Merge tag 'v3.21.72' of git://git.berlios.de/fldigi
Conflicts:
po/dl-fldigi.pot
po/es.po
po/fr.po
po/it.po
po/pl.po
src/dialogs/confdialog.cxx
src/dialogs/confdialog.fl
|
2013-11-29 15:59:42 +00:00 |
|
Daniel Richman
|
448459a704
|
Merge commit 'v3.21.67'
Conflicts:
po/dl-fldigi.pot
po/es.po
po/fr.po
po/it.po
po/pl.po
src/Makefile.am
src/cw_rtty/rtty.cxx
src/dialogs/confdialog.cxx
src/dialogs/confdialog.fl
src/include/confdialog.h
src/main.cxx
|
2013-04-01 13:10:48 +01:00 |
|
Daniel Richman
|
95f4258486
|
Merge commit 'v3.21.50'
Conflicts:
po/dl-fldigi.pot
src/Makefile.am
src/dialogs/confdialog.cxx
src/dialogs/confdialog.fl
src/dialogs/fl_digi.cxx
|
2012-08-13 15:58:25 +01:00 |
|
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 |
|
Philip Heron
|
2d7ce953a5
|
Merge commit 'v3.20.16'
Conflicts:
po/dl-fldigi.pot
po/fr.po
src/dialogs/fl_digi.cxx
src/include/configuration.h
|
2010-06-20 11:05:44 +01:00 |
|
Philip Heron
|
7d94fa2f52
|
Even more packaging changes
|
2010-05-03 10:51:52 +01:00 |