o Update with info about OPENSSH_3_6_1P2_GSSAPI_20030505.

[gssapi-openssh.git] / openssh / CVSNOTES

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index a7f30dfe665696ef6c1ca6ffb2ab22d7549c999d..8182089d4d15f978d076846c49f2fe36f28de501 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -50,6 +50,14 @@ contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2003/05/05
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
+        - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
+      Conflicts: 0
+
     2003/05/05
     ----------
       Action: Merge