svn commit: trunk/busybox/coreutils

landley at busybox.net landley at busybox.net
Tue Apr 18 20:41:54 UTC 2006


Author: landley
Date: 2006-04-18 13:41:51 -0700 (Tue, 18 Apr 2006)
New Revision: 14915

Log:
Simplify the GPL boilerplate.


Modified:
   trunk/busybox/coreutils/diff.c


Changeset:
Modified: trunk/busybox/coreutils/diff.c
===================================================================
--- trunk/busybox/coreutils/diff.c	2006-04-18 14:17:49 UTC (rev 14914)
+++ trunk/busybox/coreutils/diff.c	2006-04-18 20:41:51 UTC (rev 14915)
@@ -3,29 +3,13 @@
  * Mini diff implementation for busybox, adapted from OpenBSD diff.
  *
  * Copyright (C) 2006 by Robert Sullivan <cogito.ergo.cogito at hotmail.com>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-/*
  * Copyright (c) 2003 Todd C. Miller <Todd.Miller at courtesan.com>
  *
- * Permission to
- * use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ * 
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <time.h>




More information about the busybox-cvs mailing list