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

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Feb 15 14:53:31 2009
New Revision: 175828

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

................
r175827 | oej | 2009-02-15 21:39:55 +0100 (Sön, 15 Feb 2009) | 10 lines

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

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

format_ilbc does not depend on codec libraries and can therefore always be made. My mistake. Ursäkta!

........

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

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=175828&r1=175827&r2=175828
==============================================================================
--- branches/1.6.0/formats/format_ilbc.c (original)
+++ branches/1.6.0/formats/format_ilbc.c Sun Feb 15 14:53:31 2009
@@ -24,10 +24,6 @@
  * \arg File name extension: ilbc
  * \ingroup formats
  */
-
-/*** MODULEINFO
-        <defaultenabled>no</defaultenabled>
- ***/
 
 #include "asterisk.h"