Date: Mon, 11 Jun 2012 21:28:40 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237502 - in soc2012/jhagewood: . diff diff3 diff3/diff3 Message-ID: <20120611212840.B5A971065674@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Mon Jun 11 21:28:40 2012 New Revision: 237502 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237502 Log: Modified: soc2012/jhagewood/Milestones soc2012/jhagewood/diff/hagewood-diff.patch soc2012/jhagewood/diff3/diff3/diff3prog.c soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/Milestones ============================================================================== --- soc2012/jhagewood/Milestones Mon Jun 11 20:58:23 2012 (r237501) +++ soc2012/jhagewood/Milestones Mon Jun 11 21:28:40 2012 (r237502) @@ -1,6 +1,6 @@ May 21 - June 17 - Implement all missing features of mdocml, including legacy features. + Implement missing features of mdocml, including legacy features. Testing of mdocml. June 18 - July 1 Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Mon Jun 11 20:58:23 2012 (r237501) +++ soc2012/jhagewood/diff/hagewood-diff.patch Mon Jun 11 21:28:40 2012 (r237502) @@ -1,6 +1,6 @@ diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c --- jhagewood/diff/diff-orig/diff.c 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diff.c 2012-06-11 00:46:52.000000000 -0400 ++++ jhagewood/diff/diff/diff.c 2012-06-11 02:32:48.000000000 -0400 @@ -129,7 +129,6 @@ static struct option longopts[] = { { "report-identical-files", no_argument, NULL, 's' }, { "initial-tab", no_argument, NULL, 'T' }, Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3prog.c Mon Jun 11 20:58:23 2012 (r237501) +++ soc2012/jhagewood/diff3/diff3/diff3prog.c Mon Jun 11 21:28:40 2012 (r237502) @@ -71,7 +71,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: diff3prog.c 2012-06-8 23:36:08Z $"); +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jun 11 20:58:23 2012 (r237501) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jun 11 21:28:40 2012 (r237502) @@ -11,7 +11,7 @@ .include <bsd.prog.mk> diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c --- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-10 03:31:05.000000000 -0400 ++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-11 21:26:48.000000000 -0400 @@ -64,24 +64,34 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ @@ -25,7 +25,7 @@ #endif +#endif /* not lint */ +#include <sys/cdefs.h> -+__FBSDID("$FreeBSD: diff3prog.c 2012-06-8 23:36:08Z $"); ++__FBSDID("$FreeBSD$"); +#include <ctype.h> +#include <err.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120611212840.B5A971065674>