[COMPOSE-HPC-Commits] compose-hpc branch master updated. e602f41a85c42a6f0ca60029e5e8aad724de1584

[adrian <adr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "compose-hpc".

The branch, master has been updated
       via  e602f41a85c42a6f0ca60029e5e8aad724de1584 (commit)
       via  e093074a0e906dc5858755283c02474395bc2441 (commit)
       via  43c7b2b5f8b6af071afd353892fbe068155e48c8 (commit)
      from  c2de51ccacc1f3cc8f2660b8672408115e5eb6ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e602f41a85c42a6f0ca60029e5e8aad724de1584
Merge: e093074 c2de51c
Author: Adrian Prantl <ad...@ll...>
Date:   Mon Jul 9 11:38:58 2012 -0700

    Merge branch 'master' of ssh://compose-hpc.git.sourceforge.net/gitroot/compose-hpc/compose-hpc

commit e093074a0e906dc5858755283c02474395bc2441
Author: Adrian Prantl <ad...@ll...>
Date:   Mon Jul 9 11:34:58 2012 -0700

    fix direction of patch

commit 43c7b2b5f8b6af071afd353892fbe068155e48c8
Author: Adrian Prantl <ad...@ll...>
Date:   Fri Jul 6 16:26:19 2012 -0700

    path fixed

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

Summary of changes:
 braid/braid/chapel/makefile.py                     |    4 +-
 braid/chapel-patches/0011-split-chpl_gen_main.diff |   34 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
compose-hpc