Assert my copyright, making it explicit that i'm granting the same license

on those parts of the code and text that i have written as Kristaps is.
"fine with me" kristaps@

diff --git a/main.c b/main.c
index b0f6769b52cab203bc3e2bef53d5ae29a11ce4ad..c672f621a0c3ed599611343b00e151701ddbb6e3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
-/*     $Id: main.c,v 1.96 2010/07/02 12:54:33 kristaps Exp $ */
+/*     $Id: main.c,v 1.97 2010/07/04 22:04:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/mdoc.3 b/mdoc.3
index 681e9efa626a1766b083348386ccf9521f10b8ef..95a2adc87596529231005f5803aa4914dc1461ae 100644 (file)
--- a/mdoc.3
+++ b/mdoc.3
@@ -1,6 +1,7 @@
-.\"    $Id: mdoc.3,v 1.46 2010/07/01 09:33:39 kristaps Exp $
+.\"    $Id: mdoc.3,v 1.47 2010/07/04 22:04:04 schwarze Exp $
 .\"
-.\" Copyright (c) 2009-2010 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 1 2010 $
+.Dd $Mdocdate: July 4 2010 $
 .Dt MDOC 3
 .Os
 .Sh NAME

diff --git a/mdoc.7 b/mdoc.7
index 9eff3e9fe5ad0464a6d306ff5151bdfd3f06f3b3..6625451e156290142b5fe794dc3576465e3da405 100644 (file)
--- a/mdoc.7
+++ b/mdoc.7
@@ -1,6 +1,7 @@
-.\"    $Id: mdoc.7,v 1.129 2010/07/02 13:07:46 kristaps Exp $
+.\"    $Id: mdoc.7,v 1.130 2010/07/04 22:04:04 schwarze Exp $
 .\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 2 2010 $
+.Dd $Mdocdate: July 4 2010 $
 .Dt MDOC 7
 .Os
 .Sh NAME

diff --git a/mdoc.c b/mdoc.c
index 205bb485ff02c0ea8e562c0d34505d5afb43eb15..37b223e5e29a7a5fa7eff6f7cfc06d99587392e4 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc.c,v 1.156 2010/07/02 12:54:33 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.157 2010/07/04 22:04:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 3623ac63817845ee6fc28126ee99af64223fb785..b4267306db31fd3eea633b015181b3d72a3a85be 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_macro.c,v 1.91 2010/07/02 10:53:28 kristaps Exp $ */
+/*     $Id: mdoc_macro.c,v 1.92 2010/07/04 22:04:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/mdoc_term.c b/mdoc_term.c
index 571eef7e76015fdeaa78fbebde147bece8fe95c1..cdad7fb5dfcb203a1172778e892217163fc92a60 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.170 2010/07/04 21:59:30 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.171 2010/07/04 22:04:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/regs.h b/regs.h
index aaff1a3a9701dc8ddee5328d79fb416bab1cc447..15f57f8e776ca69fdcf9a4ff9c6774a264939289 100644 (file)
--- a/regs.h
+++ b/regs.h
@@ -1,6 +1,7 @@
-/*     $Id: regs.h,v 1.4 2010/07/03 16:02:12 schwarze Exp $ */
+/*     $Id: regs.h,v 1.5 2010/07/04 22:04:04 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/roff.3 b/roff.3
index 6c8ccd085ac07230bcad1667621710cfc970e9d4..b621ebd049fb2f07b162ad7357617dfb20f26757 100644 (file)
--- a/roff.3
+++ b/roff.3
@@ -1,6 +1,7 @@
-.\"    $Id: roff.3,v 1.4 2010/07/03 16:02:12 schwarze Exp $
+.\"    $Id: roff.3,v 1.5 2010/07/04 22:04:04 schwarze Exp $
 .\"
 .\" Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 3 2010 $
+.Dd $Mdocdate: July 4 2010 $
 .Dt ROFF 3
 .Os
 .Sh NAME

diff --git a/roff.7 b/roff.7
index f56e2d59859e52803bef76f636a375e1d61713fd..b18c29cace2669f9a728bb3b809fd1cc04228a52 100644 (file)
--- a/roff.7
+++ b/roff.7
@@ -1,6 +1,7 @@
-.\"    $Id: roff.7,v 1.11 2010/06/27 16:36:22 kristaps Exp $
+.\"    $Id: roff.7,v 1.12 2010/07/04 22:04:04 schwarze Exp $
 .\"
 .\" Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 27 2010 $
+.Dd $Mdocdate: July 4 2010 $
 .Dt ROFF 7
 .Os
 .Sh NAME

diff --git a/roff.c b/roff.c
index a644bc851c5eee4f15c6e57fa2f2fb51db886bbe..7d02df29508de53d54df822e1060071273cf709d 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,6 +1,7 @@
-/*     $Id: roff.c,v 1.92 2010/07/03 16:02:12 schwarze Exp $ */
+/*     $Id: roff.c,v 1.93 2010/07/04 22:04:04 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/term.c b/term.c
index 02aedef6e7bea8c1dbd4574d0ae13f823ee95af5..c9ce322ee8a909684abe3910b62d552feeeec1a5 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,6 +1,7 @@
-/*     $Id: term.c,v 1.158 2010/07/03 16:02:12 schwarze Exp $ */
+/*     $Id: term.c,v 1.159 2010/07/04 22:04:04 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above