[asterisk-commits] qwell: branch 1.6.0 r114661 - /branches/1.6.0/

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Apr 25 14:09:08 2008
New Revision: 114661

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114661
Log:
Blocked revisions 114660 via svnmerge

........
r114660 | qwell | 2008-04-25 13:32:22 -0500 (Fri, 25 Apr 2008) | 12 lines

Merge app_pickupchan with app_directed_pickup, for AST-27.

Initially, this was to be a new feature, with a patch from Switchvox,
 but after discussions, it was noted that this feature already existed in trunk.

The resulting discussions ended in a comment that was along the lines of
 "the patch provided here is a lot smaller than what is already in trunk,
 because it doesn't create a new application and duplicate existing code"

It was decided that these two applications could be easily merged to reduce
 code duplication.  SO, that's what this does.

........

Modified:
    branches/1.6.0/   (props changed)

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-blocked' - no diff available.