[asterisk-commits] trunk - r7828 in /trunk: ./ include/asterisk/strings.h

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Jan  5 17:54:28 2006
New Revision: 7828

URL: http://svn.digium.com/view/asterisk?rev=7828&view=rev
Log:
Merged revisions 7827 via svnmerge from
/branches/1.2

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/strings.h

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan  5 17:54:28 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7825
+/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7825,7827

Modified: trunk/include/asterisk/strings.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/strings.h?rev=7828&r1=7827&r2=7828&view=diff
==============================================================================
--- trunk/include/asterisk/strings.h (original)
+++ trunk/include/asterisk/strings.h Thu Jan  5 17:54:28 2006
@@ -54,7 +54,7 @@
   \brief Trims trailing whitespace characters from a string.
   \param ast_trim_blanks function being used
   \param str the input string
-  \return a pointer to the NULL following the string
+  \return a pointer to the modified string
  */
 AST_INLINE_API(
 char *ast_trim_blanks(char *str),