Merge commit '049c93446561c6ad3e59183c139f3916230ddee5' into nuttx-merge-5596

This merges NuttX 6.25 with one post-release bugfix.
This commit is contained in:
px4dev
2013-02-06 21:38:33 -08:00
153 changed files with 6072 additions and 2343 deletions
+1 -1
View File
@@ -242,7 +242,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =
* Name: nxf_getglyphset
*
* Description:
* Return information about the font set containtined he selected
* Return information about the font set contained in the selected
* character encoding.
*
* Input Parameters: