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@

11 files changed, 33 insertions, 22 deletions

diff --git a/main.c b/main.c
index b0f6769b..c672f621 100644
--- 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 681e9efa..95a2adc8 100644
--- 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 9eff3e9f..6625451e 100644
--- 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 205bb485..37b223e5 100644
--- 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 3623ac63..b4267306 100644
--- 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 571eef7e..cdad7fb5 100644
--- 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 aaff1a3a..15f57f8e 100644
--- 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 6c8ccd08..b621ebd0 100644
--- 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 f56e2d59..b18c29ca 100644
--- 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 a644bc85..7d02df29 100644
--- 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 02aedef6..c9ce322e 100644
--- 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