o Update CVSNOTES file with info on latest merge.

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index 932605cc0ed110ebacbb7fc72a54106979e00e17..a7f30dfe665696ef6c1ca6ffb2ab22d7549c999d 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -50,6 +50,16 @@ 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_20030408
+        - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
+      Conflicts: 2
+        - Makefile.in, configure.ac
+            caused by base changes to file
+
     2003/04/10
     ----------
       Action: Merge