[asterisk-commits] oej: branch 1.6.0 r175816 - in /branches/1.6.0: ./ formats/format_ilbc.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Feb 15 14:25:42 2009
New Revision: 175816

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

................
r175801 | oej | 2009-02-15 21:22:12 +0100 (Sön, 15 Feb 2009) | 10 lines

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

........
r175792 | oej | 2009-02-15 21:20:21 +0100 (Sön, 15 Feb 2009) | 2 lines

Disable format_ilbc.so by default, like codec_ilbc.so

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/formats/format_ilbc.c

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

Modified: branches/1.6.0/formats/format_ilbc.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/formats/format_ilbc.c?view=diff&rev=175816&r1=175815&r2=175816
==============================================================================
--- branches/1.6.0/formats/format_ilbc.c (original)
+++ branches/1.6.0/formats/format_ilbc.c Sun Feb 15 14:25:42 2009
@@ -24,7 +24,11 @@
  * \arg File name extension: ilbc
  * \ingroup formats
  */
- 
+
+/*** MODULEINFO
+        <defaultenabled>no</defaultenabled>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")