[asterisk-commits] tilghman: branch 1.6.0 r115310 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon May  5 14:58:25 2008
New Revision: 115310

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115310
Log:
Merged revisions 115309 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115309 | tilghman | 2008-05-05 14:57:28 -0500 (Mon, 05 May 2008) | 10 lines

Merged revisions 115308 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115308 | tilghman | 2008-05-05 14:55:55 -0500 (Mon, 05 May 2008) | 2 lines

Err, the documentation on the return value of ast_odbc_backslash_is_escape is exactly backwards.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/res_odbc.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/res_odbc.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/res_odbc.h?view=diff&rev=115310&r1=115309&r2=115310
==============================================================================
--- branches/1.6.0/include/asterisk/res_odbc.h (original)
+++ branches/1.6.0/include/asterisk/res_odbc.h Mon May  5 14:58:25 2008
@@ -96,7 +96,7 @@
 
 /*! \brief Checks if the database natively supports backslash as an escape character.
  * \param obj The ODBC object
- * \return Returns 1 if an ESCAPE clause is needed to support '\', 0 otherwise
+ * \return Returns 1 if backslash is a native escape character, 0 if an ESCAPE clause is needed to support '\'
  */
 int ast_odbc_backslash_is_escape(struct odbc_obj *obj);