This is an automated email from Gerrit.

Ivan De Cesaris (ivan.de.cesa...@intel.com) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/3044

-- gerrit

commit f42b8333a3b64245378623e686ec0934cb2819cc
Author: Ivan De Cesaris <ivan.de.cesa...@intel.com>
Date:   Mon Oct 26 16:50:34 2015 +0100

    quark: updating license to GPLv2+
    
    Intel is relicensing our contributions to OpenOCD under GPL
    version 2 or any later version. We previously contributed code
    under GPL version 2 only. It was not our intention to differ
    from the standard OpenOCD license. We're correcting that here.
    This also applies retroactively to previous versions of our
    contributions to OpenOCD.
    
    Change-Id: I5e831ed95d03d2044d8e5a8375b21c6e52c933d7
    Signed-off-by: Ivan De Cesaris <ivan.de.cesa...@intel.com>

diff --git a/src/target/lakemont.c b/src/target/lakemont.c
index 17b0c12..055d943 100644
--- a/src/target/lakemont.c
+++ b/src/target/lakemont.c
@@ -8,8 +8,9 @@
  * Jeffrey Maxwell (jeffrey.r.maxw...@intel.com)
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/target/lakemont.h b/src/target/lakemont.h
index e5729ae..30b34b3 100644
--- a/src/target/lakemont.h
+++ b/src/target/lakemont.h
@@ -8,8 +8,9 @@
  * Jeffrey Maxwell (jeffrey.r.maxw...@intel.com)
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/target/quark_x10xx.c b/src/target/quark_x10xx.c
index 05818b7..9a1ccb6 100644
--- a/src/target/quark_x10xx.c
+++ b/src/target/quark_x10xx.c
@@ -8,8 +8,9 @@
  * Jeffrey Maxwell (jeffrey.r.maxw...@intel.com)
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/target/x86_32_common.c b/src/target/x86_32_common.c
index 6bcd4af..3a26f71 100644
--- a/src/target/x86_32_common.c
+++ b/src/target/x86_32_common.c
@@ -8,8 +8,9 @@
  * Jeffrey Maxwell (jeffrey.r.maxw...@intel.com)
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/target/x86_32_common.h b/src/target/x86_32_common.h
index 83973b8..af57a5f 100644
--- a/src/target/x86_32_common.h
+++ b/src/target/x86_32_common.h
@@ -8,8 +8,9 @@
  * Jeffrey Maxwell (jeffrey.r.maxw...@intel.com)
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of

-- 

------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to