Merge branch 'master' into 'dev'

Aurélien Delrieu · Aurélien Delrieu · commit 266e842caa02 · 2017-04-06T18:12:21.000+02:00
Update authors and copyright

See merge request !4
diff --git a/AUTHORS b/AUTHORS
@@ -10,7 +10,7 @@ Idea and Design	: Carlo Caini <ccaini at deis.unibo.it>,
 Authors		: Daniele Lacamera <root at danielinux.net>, Dan Kruchinin <dkruchinin at google.com> 
 
 Co-Author	: Sergio Ammirata <sergio.ammirata at wialan.com>
-
+              Joaquin Muguerza <joaquin.muguerza at toulouse.viveris.com>
 
 Please Refer to COPYING for license.
 
diff --git a/include/syntab.h b/include/syntab.h
@@ -3,7 +3,7 @@
  *
  * Copyleft Daniele Lacamera 2005-2007
  * Copyleft Dan Kruchinin <dkruchinin@acm.org> 2010
- * Copyleft Joaquin Muguerza <jmuguerza@toulouse.viveris.fr> 2016
+ * Copyright CNES 2017
  * See AUTHORS and COPYING before using this software.
  *
  *
diff --git a/src/pep.c b/src/pep.c
@@ -3,7 +3,7 @@
  *
  * Copyleft Daniele Lacamera 2005
  * Copyleft Dan Kruchining <dkruchinin@acm.com> 2010
- * Copyleft Joaquin Muguerza <jmuguerza@toulouse.viveris.fr> 2016
+ * Copyright CNES 2017
  * See AUTHORS and COPYING before using this software.
  *
  *
diff --git a/src/syntab.c b/src/syntab.c
@@ -2,7 +2,7 @@
  * PEPsal : A Performance Enhancing Proxy for Satellite Links
  *
  * Copyleft Dan Kruchinin <dkruchinin@acm.org> 2010
- * Copyleft Joaquin Muguerza <jmuguerza@toulouse.viveris.fr> 2016
+ * Copyright CNES 2017
  * See AUTHORS and COPYING before using this software.
  *
  *

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyleft Daniele Lacamera 2005-2007`
`5`	`5`	`* Copyleft Dan Kruchinin <dkruchinin@acm.org> 2010`
`6`		`- * Copyleft Joaquin Muguerza <jmuguerza@toulouse.viveris.fr> 2016`
	`6`	`+ * Copyright CNES 2017`
`7`	`7`	`* See AUTHORS and COPYING before using this software.`
`8`	`8`	`*`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyleft Daniele Lacamera 2005`
`5`	`5`	`* Copyleft Dan Kruchining <dkruchinin@acm.com> 2010`
`6`		`- * Copyleft Joaquin Muguerza <jmuguerza@toulouse.viveris.fr> 2016`
	`6`	`+ * Copyright CNES 2017`
`7`	`7`	`* See AUTHORS and COPYING before using this software.`
`8`	`8`	`*`
`9`	`9`	`*`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* PEPsal : A Performance Enhancing Proxy for Satellite Links`
`3`	`3`	`*`
`4`	`4`	`* Copyleft Dan Kruchinin <dkruchinin@acm.org> 2010`
`5`		`- * Copyleft Joaquin Muguerza <jmuguerza@toulouse.viveris.fr> 2016`
	`5`	`+ * Copyright CNES 2017`
`6`	`6`	`* See AUTHORS and COPYING before using this software.`
`7`	`7`	`*`
`8`	`8`	`*`