[asterisk-scf-commits] asterisk-scf/release/design.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  b2eb51b62d8def7ca0eb1f9aa27d138b63aa5270 (commit)
      from  6dc950cb9ad455440e4282cbc6991850e6a354df (commit)

Summary of changes:
 HydraObjectModel.EAP |  Bin 1787904 -> 1787904 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit b2eb51b62d8def7ca0eb1f9aa27d138b63aa5270
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Sep 2 19:02:03 2010 -0500

    Resolved conflicts arising from sharing items on two different views of
    Data Store diagram.

diff --git a/HydraObjectModel.EAP b/HydraObjectModel.EAP
index f238f09..0c33e8f 100644
Binary files a/HydraObjectModel.EAP and b/HydraObjectModel.EAP differ

-----------------------------------------------------------------------


-- 
asterisk-scf/release/design.git