diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
| commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
| tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /AUTHORS | |
| parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
| parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) | |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,11 +18,11 @@ sethdlc Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> smdiag Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> smmixer Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> ttylinkd Craig Small VK2XLZ <csmall@small.dropbear.id.au> -dmascc_cfg Klaus Kudielka +dmascc_cfg Klaus Kudielka xfhdlcchpar Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> xfhdlcst Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> xfsmdiag Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> xfsmmixer Thomas Sailer HB9JNX <t.sailer@alumni.ethz.ch> -yamcfg Jean-Paul Roubelat F6FBB <jpr@f6fbb.org> +yamcfg Jean-Paul Roubelat F6FBB <jpr@f6fbb.org> All others Jonathon Naylor G4KLX <g4klx@g4klx.demon.co.uk> |