[asterisk-commits] lmadsen: branch 1.8 r303274 - /branches/1.8/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Fri Jan 21 10:29:22 2011
New Revision: 303274

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303274
Log:
Blocked revisions 303273 via svnmerge

........
  r303273 | lmadsen | 2011-01-21 10:12:54 -0600 (Fri, 21 Jan 2011) | 9 lines
  
  Fix changes to L() flag in Dial().
  
  Tony Mountifield pointed out an error I had in my patch. I was a bit too aggressive
  on changing 'seconds' to 'milliseconds'. So I decided to do some additioanl testing
  and have no changed just the appropriate lines. One line says milliseconds, and the
  other says seconds. Probably should change this to be either just seconds or
  milliseconds, but I've spent too much time on this already :)
  
  (issue #18264)
........

Modified:
    branches/1.8/   (props changed)

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-blocked (original)
+++ branch-1.6.2-blocked Fri Jan 21 10:29:22 2011
@@ -1,1 +1,1 @@
-/branches/1.6.2:279852,279883,280227,280556,280812,282668,299533
+/branches/1.6.2:279852,279883,280227,280556,280812,282668,299533,303273