[asterisk-commits] pabelanger: trunk r295364 - in /trunk: ./ configs/res_curl.conf.sample

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Nov 17 08:22:42 2010
New Revision: 295364

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

........
  r295361 | pabelanger | 2010-11-17 09:09:38 -0500 (Wed, 17 Nov 2010) | 2 lines
  
  Uncomment settings under [global], to surpress warning when loading Asterisk.
........

Modified:
    trunk/   (props changed)
    trunk/configs/res_curl.conf.sample

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

Modified: trunk/configs/res_curl.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/res_curl.conf.sample?view=diff&rev=295364&r1=295363&r2=295364
==============================================================================
--- trunk/configs/res_curl.conf.sample (original)
+++ trunk/configs/res_curl.conf.sample Wed Nov 17 08:22:42 2010
@@ -3,6 +3,6 @@
 ;
 [globals]
 ;proxy=myproxy.example.com
-;proxytype=http
-;proxyport=8001
+proxytype=http
+proxyport=8001
 ;proxyuserpwd=asterisk:asteriskrocks