merged OPENSSH_3_7_1P2_GSSAPI_20040123 to GPT-branch

[gssapi-openssh.git] / openssh / CVSNOTES

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index f1e5144714a2e4f333cb3fc55b7331f25d3a4dd4..d99971c0a0e8d398dfa33ebaac3d07cd9d5d3377 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -53,6 +53,14 @@ contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2004/01/23
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
+        - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
+      Conflicts: 0
+
     2004/01/19
     ----------
       Action: Merge