Date: Thu, 13 Mar 2014 23:10:34 -0400 From: Eitan Adler <eadler@freebsd.org> To: Gleb Smirnoff <glebius@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r263142 - in head: lib/libpam/modules/pam_radius lib/libpam/modules/pam_tacplus sbin/mdconfig secure/usr.bin/bdes share/doc/papers/beyond4.3 share/doc/papers/diskperf share/doc/papers/f... Message-ID: <CAF6rxgkLb6yh-5dL=jXW0_dd_yOWh8SHvRLLK9qXtbtFuexToA@mail.gmail.com> In-Reply-To: <20140314030925.GG40073@FreeBSD.org> References: <201403140307.s2E37q5R039829@svn.freebsd.org> <20140314030925.GG40073@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 13 March 2014 23:09, Gleb Smirnoff <glebius@freebsd.org> wrote: > On Fri, Mar 14, 2014 at 03:07:52AM +0000, Eitan Adler wrote: > E> Author: eadler > E> Date: Fri Mar 14 03:07:51 2014 > E> New Revision: 263142 > E> URL: http://svnweb.freebsd.org/changeset/base/263142 > E> > E> Log: > E> multiple: Remove 3rd clause from BSD license where approved by the > E> regents and renumber. > E> > E> This patch skips files in contrib/ and crypto/ > E> > E> Acked by: imp > E> Discussed with: emaste > E> > E> Added: > E> head/usr.sbin/IPXrouted/ > E> - copied from r262539, head/usr.sbin/IPXrouted/ > > Seems like you blindly did "mine full", when subversion reported > you a merge conflict. I thought I hit "theirs full". I noticed this and am working on fixing it. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgkLb6yh-5dL=jXW0_dd_yOWh8SHvRLLK9qXtbtFuexToA>