Merged revisions 292376 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 20 Oct 2010 00:41:49 +0000 (00:41 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 20 Oct 2010 00:41:49 +0000 (00:41 +0000)
commit41260a6f20dc2a5974e80d2fc3be614ca9c5e8c8
treefc8e25789b160a095fd8531865c0d16a31a79223
parent54ee79d254e5406d6feed57966183e19f507a020
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).
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_musiconhold.c