[svn-commits] rmudgett: branch rmudgett/bridge_tasks r395433 - in /team/rmudgett/bridge_tas...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jul 25 13:58:50 2013
New Revision: 395433

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395433
Log:
Multiple revisions 395431-395432

........
  r395431 | rmudgett | 2013-07-25 13:42:10 -0500 (Thu, 25 Jul 2013) | 5 lines
  
  Restore bridging files history.
  ........
  
  Merged revisions 395430 from http://svn.asterisk.org/svn/asterisk/trunk
........
  r395432 | rmudgett | 2013-07-25 13:52:51 -0500 (Thu, 25 Jul 2013) | 1 line
  
  Fix ancestry.
........

Merged revisions 395431-395432 from http://svn.asterisk.org/svn/asterisk/team/rmudgett/bridge_phase

Added:
    team/rmudgett/bridge_tasks/include/asterisk/bridge.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_after.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_after.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_basic.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_basic.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_channel.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_channel.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_channel_internal.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_channel_internal.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_features.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_features.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_internal.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_internal.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_roles.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_roles.h
    team/rmudgett/bridge_tasks/include/asterisk/bridge_technology.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/bridge_technology.h
    team/rmudgett/bridge_tasks/include/asterisk/stasis_bridges.h
      - copied unchanged from r395432, team/rmudgett/bridge_phase/include/asterisk/stasis_bridges.h
    team/rmudgett/bridge_tasks/main/bridge.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/bridge.c
    team/rmudgett/bridge_tasks/main/bridge_after.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/bridge_after.c
    team/rmudgett/bridge_tasks/main/bridge_basic.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/bridge_basic.c
    team/rmudgett/bridge_tasks/main/bridge_channel.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/bridge_channel.c
    team/rmudgett/bridge_tasks/main/bridge_roles.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/bridge_roles.c
    team/rmudgett/bridge_tasks/main/manager_bridges.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/manager_bridges.c
    team/rmudgett/bridge_tasks/main/stasis_bridges.c
      - copied unchanged from r395432, team/rmudgett/bridge_phase/main/stasis_bridges.c
Modified:
    team/rmudgett/bridge_tasks/   (props changed)

Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
--- bridge_phase-integrated (original)
+++ bridge_phase-integrated Thu Jul 25 13:58:50 2013
@@ -1,1 +1,1 @@
-/trunk:1-395421
+/trunk:1-395430

Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
--- bridge_tasks-integrated (original)
+++ bridge_tasks-integrated Thu Jul 25 13:58:50 2013
@@ -1,1 +1,1 @@
-/team/rmudgett/bridge_phase:1-395422
+/team/rmudgett/bridge_phase:1-395432