Merge from OPENSSH_3_8_1P1_GSSAPI_20040713 to OPENSSH_3_9P1_GSSAPI_20040818.

[gssapi-openssh.git] / openssh / CVSNOTES

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index dba425c830bc9608ad7af243aee36a3f4bea8bf6..e0131f3e9b2e78ec4087585759690219937f4067 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -51,6 +51,22 @@ module that contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2004/08/19
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_8_1P1_GSSAPI_20040713
+        - new base: OPENSSH_3_9P1_GSSAPI_20040818
+      Conflicts: 3
+        - Makefile.in
+          Include pathnames.o in LIBSSH_OBJS.
+        - pathnames.h
+          Set _PATH_SSH_KEY_SIGN to be an extern char pointer (instead of #defined).
+        - ssh-agent.c
+          Include pathnames.h.
+        - version.h
+          Update to new package version information.
+
     2004/06/29
     ----------
       Action: Merge