summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2015-05-02 00:19:09 +0200
committerRalf Baechle <ralf@linux-mips.org>2015-05-02 00:19:09 +0200
commit56e847dae8f585254c6b336ea557bd75a0574711 (patch)
tree7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /NEWS
parent62ceba5818d888041adbd466e8c67a8104bcf4fa (diff)
parent67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff)
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts: ax25/axspawn.c
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS2
1 files changed, 0 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 51c9a85..3605bda 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1 @@
This is some news about ax25-tools
-
-