From owner-cvs-all@FreeBSD.ORG  Sun Jun  5 16:55:46 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@freebsd.org
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5203216A421
	for <cvs-all@freebsd.org>; Sun,  5 Jun 2005 16:55:46 +0000 (GMT)
	(envelope-from pawel.worach@gmail.com)
Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4533D43D53
	for <cvs-all@freebsd.org>; Sun,  5 Jun 2005 16:55:45 +0000 (GMT)
	(envelope-from pawel.worach@gmail.com)
Received: by wproxy.gmail.com with SMTP id 69so935689wra
	for <cvs-all@freebsd.org>; Sun, 05 Jun 2005 09:55:44 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:user-agent:x-accept-language:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding;
	b=Gpugy0qRdSB8swoVu/iDVbjGkcj/ZIEGjljVo/bhdffpvJ0VEalmvbg8zhIEouKk2Cc+ey188BGI1s2sot7EOwxepb7PDM1+5RPlrEtbU16ynYebyYMrl7+1EG6fB0S66yNi3hhOlcSg8gIpSX9l6XbzwoCagudN5tbQPo0vkRw=
Received: by 10.54.16.63 with SMTP id 63mr589249wrp;
	Sun, 05 Jun 2005 09:55:44 -0700 (PDT)
Received: from ?192.168.1.200? ([213.64.231.30])
	by mx.gmail.com with ESMTP id 66sm3516683wra.2005.06.05.09.55.43;
	Sun, 05 Jun 2005 09:55:44 -0700 (PDT)
Message-ID: <42A32E8D.1030300@gmail.com>
Date: Sun, 05 Jun 2005 18:55:41 +0200
From: Pawel Worach <pawel.worach@gmail.com>
User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050526)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Dag-Erling Smorgrav <des@FreeBSD.org>
References: <200506051546.j55Fk9Jj065364@repoman.freebsd.org>
In-Reply-To: <200506051546.j55Fk9Jj065364@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/crypto/openssh LICENCE acconfig.h auth-chall.c
 auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rsa.c auth.c
 auth.h
 auth1.c auth2-chall.c auth2-kbdint.c auth2.c authfile.c bufaux.c canohost.c
 channels.c channels.h cipher.c compat.c ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2005 16:55:46 -0000

Dag-Erling Smorgrav wrote:
> des         2005-06-05 15:46:09 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:

>   Log:
>   Resolve conflicts.
>   
>   Revision  Changes    Path

>   1.29      +4 -3      src/crypto/openssh/version.h

Tiny nit.

--- crypto/openssh/version.h.orig	Sun Jun  5 18:52:46 2005
+++ crypto/openssh/version.h	Sun Jun  5 18:53:01 2005
@@ -6,7 +6,7 @@
  #define SSH_VERSION             (ssh_version_get())
  #define SSH_RELEASE             (ssh_version_get())
  #define SSH_VERSION_BASE        "OpenSSH_4.1p1"
-#define SSH_VERSION_ADDENDUM    "FreeBSD-20041028"
+#define SSH_VERSION_ADDENDUM    "FreeBSD-20050605"

  const char *ssh_version_get(void);
  void ssh_version_set_addendum(const char *add);

-- 
Pawel