[hydra-commits] hydra/ice branch, master, updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  3732934a0a645c8d6a2d458368d41156514a8a94 (commit)
       via  68a906019bc5a3c4f40e0311f2a0a114f744347d (commit)
       via  2086c2eb3412bfa0d4f864aeda068f2c54a0eaeb (commit)
       via  e4dcbfb5d5168ad4e4d9b72d652627fb8d736dda (commit)
      from  0d80779d07207eeb44b84378d6969c3feec9c8ab (commit)

Summary of changes:
 cpp/test/Ice/versioning/version1/Makefile |    5 ++++-
 cpp/test/Ice/versioning/version2/Makefile |    4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 3732934a0a645c8d6a2d458368d41156514a8a94
Merge: 2086c2e 68a9060
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Jun 25 20:00:48 2010 -0230

    Merge branch 'puffin-slice-translator-versioning'


commit 2086c2eb3412bfa0d4f864aeda068f2c54a0eaeb
Merge: 0d80779 e4dcbfb
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Jun 25 19:38:53 2010 -0230

    Merge branch 'puffin-slice-translator-versioning'


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


-- 
hydra/ice