[asterisk-commits] russell: branch russell/messaging r302269 - in /team/russell/messaging: ./ main/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jan 18 14:22:30 2011
New Revision: 302269

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302269
Log:
sync with trunk

Modified:
    team/russell/messaging/   (props changed)
    team/russell/messaging/main/astobj2.c

Propchange: team/russell/messaging/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/russell/messaging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 18 14:22:30 2011
@@ -1,1 +1,1 @@
-/trunk:1-302258
+/trunk:1-302268

Modified: team/russell/messaging/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/messaging/main/astobj2.c?view=diff&rev=302269&r1=302268&r2=302269
==============================================================================
--- team/russell/messaging/main/astobj2.c (original)
+++ team/russell/messaging/main/astobj2.c Tue Jan 18 14:22:30 2011
@@ -60,7 +60,7 @@
 };
 
 #ifdef AST_DEVMODE
-#define AO2_DEBUG 1
+/* #define AO2_DEBUG 1 */
 #endif
 
 #ifdef AO2_DEBUG