summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-11 07:56:37 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-11 07:56:37 -0600
commit678358057d08cee1d1e9c417d820da966a019ed7 (patch)
tree28fc2f9e900af90b6154d2e1a25fcf44896db553
parent55c6a5ce38c1433e984ee5c209d893ceb8ce2312 (diff)
downloadpx4-nuttx-678358057d08cee1d1e9c417d820da966a019ed7.tar.gz
px4-nuttx-678358057d08cee1d1e9c417d820da966a019ed7.tar.bz2
px4-nuttx-678358057d08cee1d1e9c417d820da966a019ed7.zip
Update ChangeLog
-rw-r--r--apps/ChangeLog.txt3
-rwxr-xr-xnuttx/ChangeLog2
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index dff40047c..522c0a429 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -1221,4 +1221,5 @@
* apps/examples/ostest: Improved error checking for sem_timedwait()
from Juha Niskanen (2015-02-20).
-
+ * apps/netutils/Kconfig, Make.defs, and pppd/: Add a PPP daemon. From
+ Max Neklyudov (2015-03-11).
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 6da95886a..5a3f1643c 100755
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -9947,3 +9947,5 @@
(2015-03-10).
* arch/arm/src/tiva/tiva_timerlib.c: Fix a typo in peripheral wait
logic: gptm, not gpio. From Bradley Noyes (2015-03-10).
+ * drivers/net/tun.c, Make.defs, include/nuttx/net/net.h, tun.h, and
+ net/Kconfig: Add TUN device. From Max Neklyudov (2015-03-11).