[svn-commits] tilghman: trunk r292377 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Oct 19 19:41:49 2010
New Revision: 292377

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

........
  r292376 | tilghman | 2010-10-19 19:40:29 -0500 (Tue, 19 Oct 2010) | 5 lines
  
  Oops.  This module uses the generic timer and no longer uses DAHDI.
  
  This causes a problem with the Solaris and other system builds that have gcc
  4.1 (where optional_api is non-optional).
........

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

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

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=292377&r1=292376&r2=292377
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Tue Oct 19 19:41:49 2010
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2006, Digium, Inc.
+ * Copyright (C) 1999 - 2010, Digium, Inc.
  *
  * Mark Spencer <markster at digium.com>
  *
@@ -27,7 +27,6 @@
 
 /*** MODULEINFO
 	<conflict>win32</conflict>
-	<use>dahdi</use>
  ***/
 
 #include "asterisk.h"