From: adilger <adilger>
Date: Fri, 23 May 2003 07:01:26 +0000 (+0000)
Subject: Merge b_devel -> b_orphan.
X-Git-Tag: v1_7_100~1^248~99
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=cba8f3409fa319bc72d82fa1f95a00a7fdbb9654;p=fs%2Flustre-release.git

Merge b_devel -> b_orphan.
  DEVEL_ORPHAN_UPDATE_PARENT_20030522 -> DEVEL_ORPHAN_UPDATE_PARENT_20030522
---

diff --git a/lustre/include/.cvsignore b/lustre/include/.cvsignore
index 864df96..7b78c04 100644
--- a/lustre/include/.cvsignore
+++ b/lustre/include/.cvsignore
@@ -4,6 +4,7 @@ config.status
 configure
 config.h
 stamp-h
+stamp-h1
 stamp-h.in
 Makefile
 Makefile.in