[svn-commits] wdoekes: branch 12 r423659 - in /branches/12: ./ main/editline/readline.c

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Mon Sep 22 12:41:03 2014
New Revision: 423659

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423659
Log:
cli.c: Fix tab completion "module load" when MALLOC_DEBUG is enabled.

r421600 conflicted with r155763.

ASTERISK-24348 #close
........

Merged revisions 423657 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 423658 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/main/editline/readline.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/editline/readline.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/editline/readline.c?view=diff&rev=423659&r1=423658&r2=423659
==============================================================================
--- branches/12/main/editline/readline.c (original)
+++ branches/12/main/editline/readline.c Mon Sep 22 12:41:03 2014
@@ -36,7 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "asterisk.h"
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 __RCSID("$NetBSD: readline.c,v 1.21 2002/03/18 16:20:36 christos Exp $");