[svn-commits] kpfleming: trunk r1662 - in /trunk: ./ zconfig.h

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed Nov 29 16:29:08 2006
New Revision: 1662

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1662
Log:
Merged revisions 1661 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1661 | kpfleming | 2006-11-29 16:27:20 -0600 (Wed, 29 Nov 2006) | 10 lines

Merged revisions 1660 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1660 | kpfleming | 2006-11-29 16:24:07 -0600 (Wed, 29 Nov 2006) | 2 lines

clarify the BOOST_RINGER compile-time option

........

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

Modified:
    trunk/   (props changed)
    trunk/zconfig.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Nov 29 16:29:08 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661

Modified: trunk/zconfig.h
URL: http://svn.digium.com/view/zaptel/trunk/zconfig.h?view=diff&rev=1662&r1=1661&r2=1662
==============================================================================
--- trunk/zconfig.h (original)
+++ trunk/zconfig.h Wed Nov 29 16:29:08 2006
@@ -31,6 +31,8 @@
 
 /*
  * Boost ring voltage (Higher ring voltage, takes more power)
+ * Note: this only affects the wcfxsusb and wcusb drivers; all other
+ *       drivers have a 'boostringer' module parameter.
  */
 /* #define BOOST_RINGER */