o New CVSNOTES reflects merge to OPENSSH_3_5P1_GSI_20030227.

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index 72485e3950d95826471e03268b07055a060c0ced..5dedcb9d9586653bd09ad510f4ec9e4374db30fb 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -100,3 +100,13 @@ contains the GSI-OpenSSH code.  Consider it a living document.
     ----------
       Action: Tag GPT branch as new release
         - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+
+    2003/03/07
+    ----------
+      Action: Merge
+        - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+        - original base: OPENSSH_3_5P1_GSI_20021018
+        - new base: OPENSSH_3_5P1_GSI_20030227
+      Conflicts: 1
+        - configure.ac
+            cvs choked on my changes to the globus additions.  wasn't a "real" conflict.