From cba8f3409fa319bc72d82fa1f95a00a7fdbb9654 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 23 May 2003 07:01:26 +0000
Subject: [PATCH] Merge b_devel -> b_orphan.  
 DEVEL_ORPHAN_UPDATE_PARENT_20030522 -> DEVEL_ORPHAN_UPDATE_PARENT_20030522

---
 lustre/include/.cvsignore | 1 +
 1 file changed, 1 insertion(+)

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
-- 
1.8.3.1