merged from trunk tag OPENSSH_3_8_1P1_GSSAPI_20040713 to GPT-branch

[gssapi-openssh.git] / openssh / CVSNOTES

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index d55355ad648bb53db8fa7e6ec9c33eea64eacd5b..dba425c830bc9608ad7af243aee36a3f4bea8bf6 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -51,12 +51,20 @@ module that contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2004/06/29
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_8_1P1_GSSAPI_20040629
+        - new base: OPENSSH_3_8_1P1_GSSAPI_20040713
+      Conflicts: 0
+
     2004/06/29
     ----------
       Action: Merge
         - occurred on: GPT branch
         - orig base: OPENSSH_3_8P1_GSSAPI_20040422
-        - new base: OPENSSH_3_8_P1_GSSAPI_20040629
+        - new base: OPENSSH_3_8_1P1_GSSAPI_20040629
       Conflicts: 4
         - ChangeLog
            Old log entries were trimmed in the 3.8.1p1 release.