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

[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  fce998716bef06a170909a9d263640176fbd1198 (commit)
       via  8e861e4f895779227198f1a766bd47ea83d98091 (commit)
      from  46c8461771ddade25d9f286867ff619fff11a2f5 (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 fce998716bef06a170909a9d263640176fbd1198
Merge: 8e861e4 46c8461
Author: Adrian Prantl <ad...@ll...>
Date:   Wed Jul 11 11:15:38 2012 -0700

    Merge branch 'master' of ssh://compose-hpc.git.sourceforge.net/gitroot/compose-hpc/compose-hpc
    
    Conflicts:
    	braid/doc/braid.1
    	braid/doc/users_guide.html
    	braid/regression/interop/tests.mk

commit 8e861e4f895779227198f1a766bd47ea83d98091
Author: Adrian Prantl <ad...@ll...>
Date:   Wed Jul 11 11:07:59 2012 -0700

    make end_count_global a wide reference

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

Summary of changes:
 braid/Makefile.in                                  |    2 +-
 braid/chapel-patches/0011-split-chpl_gen_main.diff |    2 +-
 braid/doc/braid.1                                  |    2 +-
 braid/doc/users_guide.html                         |    6 +-
 braid/regression/interop/tests.mk                  | 3465 +++++++++++++++++++-
 rote/minitermite/doc/src2term.1                    |    6 +-
 rote/minitermite/doc/term2src.1                    |    6 +-
 7 files changed, 3470 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
compose-hpc