diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-21 15:54:11 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-21 15:54:11 -0600 |
commit | db3ba2bf0994f0d0c9fef0b9ff08d71cc4aefe57 (patch) | |
tree | f7bcb0d25022acfaa3b3988efaf80004cc101fe9 | |
parent | 8762c7a0b648d20fe0651e58b0e2d4fc00151789 (diff) | |
download | nuttx-db3ba2bf0994f0d0c9fef0b9ff08d71cc4aefe57.tar.gz nuttx-db3ba2bf0994f0d0c9fef0b9ff08d71cc4aefe57.tar.bz2 nuttx-db3ba2bf0994f0d0c9fef0b9ff08d71cc4aefe57.zip |
Fix some minor typos in the uClibc++ install script
-rwxr-xr-x | misc/uClibc++/install.sh | 6 | ||||
-rwxr-xr-x | nuttx/ChangeLog | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/uClibc++/install.sh b/misc/uClibc++/install.sh index f3dc09892..9bfb92828 100755 --- a/misc/uClibc++/install.sh +++ b/misc/uClibc++/install.sh @@ -273,10 +273,10 @@ fi # Licensing echo "You are about to install the uClibc++ library into the NuttX source" -echo "tree. NuttX is licensed under the permissive, modified BSD License; uClibc" +echo "tree. NuttX is licensed under the permissive, modified BSD License; uClibc++" echo "is licensed under the GNU LGPL Version 3 license. When you install" -echo "uClibc++ into the NuttX source tree, you must then comply with uClibc's" -echo "stricter GNU LGPL Version 3 license." +echo "uClibc++ into the NuttX source tree, you must then comply with all aspects" +echo "of uClibc++'s stricter GNU LGPL Version 3 license." echo "" readyn "Continue" "N" diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 3f4b36c3b..94f91b1c5 100755 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -9838,7 +9838,7 @@ timers/rtc.c: The inode unlink method should not be support if operations on the root pseudo-filesystem are disabled (2015-02-18). * include/nuttx/sched timing functions: Fix some nanosecond comparisons. - Comparisons should be greate thatn OR EQUAL TO 1000000000 for maximum + Comparisons should be greate than OR EQUAL TO 1000000000 for maximum value of nanoseconds in struct tm. From Juha Niskanen (2015-02-20). * tm4c123g-launchpad: Add board button interrupt logic. From Calvin Maguranis (2015-02-20). |