[asterisk-commits] rmudgett: branch dvossel/generic_aoc r255703 - /team/dvossel/generic_aoc/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Mar 31 18:16:10 2010
New Revision: 255703

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255703
Log:
Avoid conflict for something that is already in this branch.

  Merged revisions 255702 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/team/rmudgett/aoc_event

  ........
    r255702 | rmudgett | 2010-03-31 18:14:07 -0500 (Wed, 31 Mar 2010) | 2 lines

    Adjust AOC AMI events after discussions with DVossel.
  ........

Modified:
    team/dvossel/generic_aoc/   (props changed)

Propchange: team/dvossel/generic_aoc/
------------------------------------------------------------------------------
--- generic_aoc-integrated (original)
+++ generic_aoc-integrated Wed Mar 31 18:16:10 2010
@@ -1,1 +1,1 @@
-/team/rmudgett/aoc_event:1-255687
+/team/rmudgett/aoc_event:1-255702