[asterisk-commits] tilghman: trunk r283320 - in /trunk: ./ cdr/ cel/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Aug 23 16:35:09 2010
New Revision: 283320

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283320
Log:
Merged revisions 283319 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283319 | tilghman | 2010-08-23 16:33:47 -0500 (Mon, 23 Aug 2010) | 9 lines
  
  Merged revisions 283318 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r283318 | tilghman | 2010-08-23 16:32:14 -0500 (Mon, 23 Aug 2010) | 2 lines
    
    CDR drivers depend upon res_odbc, not directly on the ODBC libraries
  ........
................

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_adaptive_odbc.c
    trunk/cdr/cdr_odbc.c
    trunk/cel/cel_adaptive_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_adaptive_odbc.c?view=diff&rev=283320&r1=283319&r2=283320
==============================================================================
--- trunk/cdr/cdr_adaptive_odbc.c (original)
+++ trunk/cdr/cdr_adaptive_odbc.c Mon Aug 23 16:35:09 2010
@@ -25,8 +25,7 @@
  */
 
 /*** MODULEINFO
-	<depend>generic_odbc</depend>
-	<depend>ltdl</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"

Modified: trunk/cdr/cdr_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_odbc.c?view=diff&rev=283320&r1=283319&r2=283320
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Mon Aug 23 16:35:09 2010
@@ -29,8 +29,7 @@
  */
 
 /*** MODULEINFO
-	<depend>generic_odbc</depend>
-	<depend>ltdl</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"

Modified: trunk/cel/cel_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_adaptive_odbc.c?view=diff&rev=283320&r1=283319&r2=283320
==============================================================================
--- trunk/cel/cel_adaptive_odbc.c (original)
+++ trunk/cel/cel_adaptive_odbc.c Mon Aug 23 16:35:09 2010
@@ -27,8 +27,7 @@
  */
 
 /*** MODULEINFO
-	<depend>generic_odbc</depend>
-	<depend>ltdl</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"