[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r321268 - /team/may/ooh323_ipv6_direct...

[SVN commits to the Asterisk project]

Author: may
Date: Fri May 27 07:34:44 2011
New Revision: 321268

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321268
Log:
Merged revisions 313280 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r313280 | lmadsen | 2011-04-11 23:39:26 +0400 (Mon, 11 Apr 2011) | 28 lines
  
  Merged revisions 313279 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r313279 | lmadsen | 2011-04-11 14:36:40 -0500 (Mon, 11 Apr 2011) | 21 lines
    
    Merged revisions 313278 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.6.2
    
    ................
      r313278 | lmadsen | 2011-04-11 14:33:03 -0500 (Mon, 11 Apr 2011) | 14 lines
      
      Merged revisions 313277 via svnmerge from 
      https://origsvn.digium.com/svn/asterisk/branches/1.4
      
      ........
        r313277 | lmadsen | 2011-04-11 14:30:20 -0500 (Mon, 11 Apr 2011) | 6 lines
        
        Fix detection of OpenSSL 1.0
        
        (closes issue #19093)
        Reported by: tzafrir
        Patches: 
              detect_openssl_10.diff uploaded by tzafrir (license 46)
      ........
    ................
  ................
................

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/configure

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
            ('svnmerge-blocked' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 27 07:34:44 2011
@@ -1,1 +1,1 @@
-/trunk:1-313143,313191
+/trunk:1-313143,313191,313280