From 43c40b6b8a6b6aeceb71a1d8d3c753c154d8d8d7 Mon Sep 17 00:00:00 2001
From: MPI Team <mpiteam@open-mpi.org>
Date: Sat, 10 May 2014 05:00:26 +0000
Subject: [PATCH] Update git/hg ignore files

This commit was SVN r31713.
---
 .gitignore_global | 4 ----
 .hgignore_global  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.gitignore_global b/.gitignore_global
index 9a8609a2aa..7f5c597f0e 100644
--- a/.gitignore_global
+++ b/.gitignore_global
@@ -47,7 +47,6 @@ vc70.pdb
 .hg
 .hgignore_local
 config.lt
-orcm
 config/ylwrap
 config/config.guess
 config/config.sub
@@ -520,9 +519,7 @@ orte/include/orte/frameworks.h
 orte/mca/dfs/vc70.pdb
 orte/mca/dfs/base/*.obj
 orte/mca/errmgr/vc70.pdb
-orte/mca/errmgr/orcm
 orte/mca/errmgr/base/*.obj
-orte/mca/ess/orcm
 orte/mca/filem/orte_filem.7
 orte/mca/odls/default/.gdb_history
 orte/mca/oob/tcp/acinclude.m4
@@ -545,7 +542,6 @@ orte/mca/oob/usock/autom4te.cache
 orte/mca/oob/usock/.lam*
 orte/mca/rmaps/rank_file/rmaps_rank_file_lex.c
 orte/mca/rmaps/rank_file/rankfile_lex.c
-orte/mca/routed/orcm
 orte/mca/rtc/base/*.obj
 orte/mca/snapc/orte_snapc.7
 orte/mca/sstore/orte_sstore.7
diff --git a/.hgignore_global b/.hgignore_global
index c552bd85df..eaba8be190 100644
--- a/.hgignore_global
+++ b/.hgignore_global
@@ -20,7 +20,6 @@ syntax: glob
 ./.hgignore_local
 ./.gitignore_local
 ./config.lt
-./orcm
 ./config/ylwrap
 ./config/Makefile.in
 ./config/compile
@@ -725,14 +724,12 @@ syntax: glob
 ./orte/mca/dfs/test/Makefile.in
 ./orte/mca/errmgr/Makefile.in
 ./orte/mca/errmgr/vc70.pdb
-./orte/mca/errmgr/orcm
 ./orte/mca/errmgr/base/*.obj
 ./orte/mca/errmgr/default_app/Makefile.in
 ./orte/mca/errmgr/default_hnp/Makefile.in
 ./orte/mca/errmgr/default_orted/Makefile.in
 ./orte/mca/errmgr/default_tool/Makefile.in
 ./orte/mca/ess/Makefile.in
-./orte/mca/ess/orcm
 ./orte/mca/ess/alps/Makefile.in
 ./orte/mca/ess/base/Makefile.in
 ./orte/mca/ess/env/Makefile.in
@@ -802,7 +799,6 @@ syntax: glob
 ./orte/mca/rml/ftrm/Makefile.in
 ./orte/mca/rml/oob/Makefile.in
 ./orte/mca/routed/Makefile.in
-./orte/mca/routed/orcm
 ./orte/mca/routed/binomial/Makefile.in
 ./orte/mca/routed/debruijn/Makefile.in
 ./orte/mca/routed/direct/Makefile.in