From ec1f761d8e3e961f8ea77adb0248db2ee3e2e98c Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Wed, 9 Jul 2014 22:01:27 +0300 Subject: [PATCH] OSHMEM: add missing help file, got lost during merge. Thanks to Yossi/Igor for finding it. Change-Id: I466e40a3fea70e8045dd1e897edcc50ccf0451a3 Conflicts: oshmem/mca/sshmem/base/Makefile.am oshmem/mca/sshmem/base/help-oshmem-sshmem.txt --- oshmem/mca/sshmem/base/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oshmem/mca/sshmem/base/Makefile.am b/oshmem/mca/sshmem/base/Makefile.am index 9b2af1f4e1..3b0dc81ea2 100644 --- a/oshmem/mca/sshmem/base/Makefile.am +++ b/oshmem/mca/sshmem/base/Makefile.am @@ -7,7 +7,7 @@ # $HEADER$ # -dist_oshmemdata_DATA = base/help-oshmem-sshmem.txt +dist_ompidata_DATA = base/help-oshmem-sshmem.txt headers += \ base/base.h