automatic commit

diff --git a/Makefile b/Makefile
index f04583d..74d8560 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,8 @@
 #  This file is part of folded-ctf.                                   #
 #                                                                     #
 #  folded-ctf is free software: you can redistribute it and/or modify  #
-#  it under the terms of the GNU General Public License as published   #
-#  by the Free Software Foundation, either version 3 of the License,   #
-#  or (at your option) any later version.                             #
+#  it under the terms of the GNU General Public License version 3 as   #
+#  published by the Free Software Foundation.                          #
 #                                                                     #
 #  folded-ctf is distributed in the hope that it will be useful, but   #
 #  WITHOUT ANY WARRANTY; without even the implied warranty of         #

diff --git a/boosted_classifier.cc b/boosted_classifier.cc
index 9c5765c..5d73012 100644 (file)
--- a/boosted_classifier.cc
+++ b/boosted_classifier.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/boosted_classifier.h b/boosted_classifier.h
index 22cbe63..782a9c9 100644 (file)
--- a/boosted_classifier.h
+++ b/boosted_classifier.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/classifier.cc b/classifier.cc
index 6a0fa3f..c1d26dd 100644 (file)
--- a/classifier.cc
+++ b/classifier.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/classifier.h b/classifier.h
index 533ebd7..ad9fa9b 100644 (file)
--- a/classifier.h
+++ b/classifier.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/classifier_reader.cc b/classifier_reader.cc
index a4a9f53..29298ea 100644 (file)
--- a/classifier_reader.cc
+++ b/classifier_reader.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/classifier_reader.h b/classifier_reader.h
index 8f25077..4381bb4 100644 (file)
--- a/classifier_reader.h
+++ b/classifier_reader.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/decision_tree.cc b/decision_tree.cc
index f94f4e6..bcc3149 100644 (file)
--- a/decision_tree.cc
+++ b/decision_tree.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/decision_tree.h b/decision_tree.h
index 22dbc11..4903c6a 100644 (file)
--- a/decision_tree.h
+++ b/decision_tree.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/detector.cc b/detector.cc
index 3914b99..0bd651f 100644 (file)
--- a/detector.cc
+++ b/detector.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/detector.h b/detector.h
index cb75504..84c76a4 100644 (file)
--- a/detector.h
+++ b/detector.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/error_rates.cc b/error_rates.cc
index 89a9895..4744ba9 100644 (file)
--- a/error_rates.cc
+++ b/error_rates.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/error_rates.h b/error_rates.h
index 2834e6a..0396f98 100644 (file)
--- a/error_rates.h
+++ b/error_rates.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/folding.cc b/folding.cc
index 9b3c2ca..bdd93fe 100644 (file)
--- a/folding.cc
+++ b/folding.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/fusion_sort.cc b/fusion_sort.cc
index baa5f3f..1bf1bc2 100644 (file)
--- a/fusion_sort.cc
+++ b/fusion_sort.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/fusion_sort.h b/fusion_sort.h
index 70c8ce1..7e8a090 100644 (file)
--- a/fusion_sort.h
+++ b/fusion_sort.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/gaussian.cc b/gaussian.cc
index b2782f5..ef31ffe 100644 (file)
--- a/gaussian.cc
+++ b/gaussian.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/gaussian.h b/gaussian.h
index a9a5fd9..d0a3ccc 100644 (file)
--- a/gaussian.h
+++ b/gaussian.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/global.cc b/global.cc
index 34ce658..ee1aaca 100644 (file)
--- a/global.cc
+++ b/global.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/global.h b/global.h
index 01065da..3b46c74 100644 (file)
--- a/global.h
+++ b/global.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/graph.sh b/graph.sh
index 441764e..23767d6 100755 (executable)
--- a/graph.sh
+++ b/graph.sh
@@ -12,9 +12,8 @@
 #  This file is part of folded-ctf.                                   #
 #                                                                     #
 #  folded-ctf is free software: you can redistribute it and/or modify  #
-#  it under the terms of the GNU General Public License as published   #
-#  by the Free Software Foundation, either version 3 of the License,   #
-#  or (at your option) any later version.                             #
+#  it under the terms of the GNU General Public License version 3 as   #
+#  published by the Free Software Foundation.                          #
 #                                                                     #
 #  folded-ctf is distributed in the hope that it will be useful, but   #
 #  WITHOUT ANY WARRANTY; without even the implied warranty of         #

diff --git a/image.cc b/image.cc
index 9f759cf..3161e97 100644 (file)
--- a/image.cc
+++ b/image.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/image.h b/image.h
index 716d0d7..8c3a987 100644 (file)
--- a/image.h
+++ b/image.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/interval.cc b/interval.cc
index df8506a..d8b670a 100644 (file)
--- a/interval.cc
+++ b/interval.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/interval.h b/interval.h
index a93f447..6f7c4ec 100644 (file)
--- a/interval.h
+++ b/interval.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/jpeg_misc.cc b/jpeg_misc.cc
index a6799f6..3ca5984 100644 (file)
--- a/jpeg_misc.cc
+++ b/jpeg_misc.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/jpeg_misc.h b/jpeg_misc.h
index 0601b64..d5b2313 100644 (file)
--- a/jpeg_misc.h
+++ b/jpeg_misc.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image.cc b/labelled_image.cc
index b901d94..4eed0e0 100644 (file)
--- a/labelled_image.cc
+++ b/labelled_image.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image.h b/labelled_image.h
index 32b03c0..8fa52a0 100644 (file)
--- a/labelled_image.h
+++ b/labelled_image.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image_pool.cc b/labelled_image_pool.cc
index 4a939cf..70c7c83 100644 (file)
--- a/labelled_image_pool.cc
+++ b/labelled_image_pool.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image_pool.h b/labelled_image_pool.h
index f39fa36..23dbbde 100644 (file)
--- a/labelled_image_pool.h
+++ b/labelled_image_pool.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image_pool_file.cc b/labelled_image_pool_file.cc
index 5c869d8..6ea7704 100644 (file)
--- a/labelled_image_pool_file.cc
+++ b/labelled_image_pool_file.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image_pool_file.h b/labelled_image_pool_file.h
index 549ca1e..d1b81de 100644 (file)
--- a/labelled_image_pool_file.h
+++ b/labelled_image_pool_file.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image_pool_subset.cc b/labelled_image_pool_subset.cc
index 454a3c8..d1e4ac5 100644 (file)
--- a/labelled_image_pool_subset.cc
+++ b/labelled_image_pool_subset.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/labelled_image_pool_subset.h b/labelled_image_pool_subset.h
index 1436a2d..d74201b 100644 (file)
--- a/labelled_image_pool_subset.h
+++ b/labelled_image_pool_subset.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/list_to_pool.cc b/list_to_pool.cc
index af9fd2f..5d7eaa0 100644 (file)
--- a/list_to_pool.cc
+++ b/list_to_pool.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/loss_machine.cc b/loss_machine.cc
index 96da7a8..413a2a3 100644 (file)
--- a/loss_machine.cc
+++ b/loss_machine.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/loss_machine.h b/loss_machine.h
index 428c8e4..9d7a78c 100644 (file)
--- a/loss_machine.h
+++ b/loss_machine.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/materials.cc b/materials.cc
index df7abbb..986004a 100644 (file)
--- a/materials.cc
+++ b/materials.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/materials.h b/materials.h
index ecf71c6..cbb7788 100644 (file)
--- a/materials.h
+++ b/materials.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/misc.cc b/misc.cc
index a86803f..a0dd057 100644 (file)
--- a/misc.cc
+++ b/misc.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/misc.h b/misc.h
index f75d540..7ad8cbf 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/param_parser.cc b/param_parser.cc
index 60b4600..8554f41 100644 (file)
--- a/param_parser.cc
+++ b/param_parser.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/param_parser.h b/param_parser.h
index ac0aff1..855555a 100644 (file)
--- a/param_parser.h
+++ b/param_parser.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/parsing.cc b/parsing.cc
index fb0a256..0eafe5e 100644 (file)
--- a/parsing.cc
+++ b/parsing.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/parsing.h b/parsing.h
index e0435ac..b3cc8d2 100644 (file)
--- a/parsing.h
+++ b/parsing.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/parsing_pool.cc b/parsing_pool.cc
index 053620b..cc73379 100644 (file)
--- a/parsing_pool.cc
+++ b/parsing_pool.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/parsing_pool.h b/parsing_pool.h
index 6a2d9fe..5f0bff7 100644 (file)
--- a/parsing_pool.h
+++ b/parsing_pool.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pi_feature.cc b/pi_feature.cc
index 737a02d..1dba18e 100644 (file)
--- a/pi_feature.cc
+++ b/pi_feature.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pi_feature.h b/pi_feature.h
index 64da10f..505b75f 100644 (file)
--- a/pi_feature.h
+++ b/pi_feature.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pi_feature_family.cc b/pi_feature_family.cc
index 2c093a1..7d3f638 100644 (file)
--- a/pi_feature_family.cc
+++ b/pi_feature_family.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pi_feature_family.h b/pi_feature_family.h
index b171bb1..3de5a84 100644 (file)
--- a/pi_feature_family.h
+++ b/pi_feature_family.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pi_referential.cc b/pi_referential.cc
index e0e9de0..979f5d9 100644 (file)
--- a/pi_referential.cc
+++ b/pi_referential.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pi_referential.h b/pi_referential.h
index 289cfd8..a3fc29e 100644 (file)
--- a/pi_referential.h
+++ b/pi_referential.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose.cc b/pose.cc
index b8a2139..6ac5b39 100644 (file)
--- a/pose.cc
+++ b/pose.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose.h b/pose.h
index ddd9a98..d110c12 100644 (file)
--- a/pose.h
+++ b/pose.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell.cc b/pose_cell.cc
index 9d7a24f..21bdd08 100644 (file)
--- a/pose_cell.cc
+++ b/pose_cell.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell.h b/pose_cell.h
index 2a05a28..3313f29 100644 (file)
--- a/pose_cell.h
+++ b/pose_cell.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_hierarchy.cc b/pose_cell_hierarchy.cc
index 67016e9..baa6459 100644 (file)
--- a/pose_cell_hierarchy.cc
+++ b/pose_cell_hierarchy.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_hierarchy.h b/pose_cell_hierarchy.h
index 90b1f01..3165eb2 100644 (file)
--- a/pose_cell_hierarchy.h
+++ b/pose_cell_hierarchy.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_hierarchy_reader.cc b/pose_cell_hierarchy_reader.cc
index 203e42a..dc4ff0b 100644 (file)
--- a/pose_cell_hierarchy_reader.cc
+++ b/pose_cell_hierarchy_reader.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_hierarchy_reader.h b/pose_cell_hierarchy_reader.h
index 6f2e6a6..5064f10 100644 (file)
--- a/pose_cell_hierarchy_reader.h
+++ b/pose_cell_hierarchy_reader.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_scored_set.cc b/pose_cell_scored_set.cc
index c130a6b..08ad567 100644 (file)
--- a/pose_cell_scored_set.cc
+++ b/pose_cell_scored_set.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_scored_set.h b/pose_cell_scored_set.h
index a486b30..7561e2f 100644 (file)
--- a/pose_cell_scored_set.h
+++ b/pose_cell_scored_set.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_set.cc b/pose_cell_set.cc
index cc0da50..bf0202f 100644 (file)
--- a/pose_cell_set.cc
+++ b/pose_cell_set.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pose_cell_set.h b/pose_cell_set.h
index 2a58429..acbd6c2 100644 (file)
--- a/pose_cell_set.h
+++ b/pose_cell_set.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/progress_bar.cc b/progress_bar.cc
index 5ff9393..e9b8de9 100644 (file)
--- a/progress_bar.cc
+++ b/progress_bar.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/progress_bar.h b/progress_bar.h
index 1042758..222f228 100644 (file)
--- a/progress_bar.h
+++ b/progress_bar.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rectangle.h b/rectangle.h
index 1ac1fa5..bbeb29a 100644 (file)
--- a/rectangle.h
+++ b/rectangle.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rgb_image.cc b/rgb_image.cc
index eff1c7a..35d0a20 100644 (file)
--- a/rgb_image.cc
+++ b/rgb_image.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rgb_image.h b/rgb_image.h
index 6ada7da..24ee3f0 100644 (file)
--- a/rgb_image.h
+++ b/rgb_image.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rgb_image_subpixel.cc b/rgb_image_subpixel.cc
index 866e9f8..4c3e16a 100644 (file)
--- a/rgb_image_subpixel.cc
+++ b/rgb_image_subpixel.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rgb_image_subpixel.h b/rgb_image_subpixel.h
index 73e4a7e..fbb6d2e 100644 (file)
--- a/rgb_image_subpixel.h
+++ b/rgb_image_subpixel.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rich_image.cc b/rich_image.cc
index 93933f0..aa8b7e5 100644 (file)
--- a/rich_image.cc
+++ b/rich_image.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rich_image.h b/rich_image.h
index 5208d00..2a68718 100644 (file)
--- a/rich_image.h
+++ b/rich_image.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/run.sh b/run.sh
index 7942e46..cf4fe33 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -13,9 +13,8 @@
 #  This file is part of folded-ctf.                                   #
 #                                                                     #
 #  folded-ctf is free software: you can redistribute it and/or modify  #
-#  it under the terms of the GNU General Public License as published   #
-#  by the Free Software Foundation, either version 3 of the License,   #
-#  or (at your option) any later version.                             #
+#  it under the terms of the GNU General Public License version 3 as   #
+#  published by the Free Software Foundation.                          #
 #                                                                     #
 #  folded-ctf is distributed in the hope that it will be useful, but   #
 #  WITHOUT ANY WARRANTY; without even the implied warranty of         #

diff --git a/sample_set.cc b/sample_set.cc
index 5f0ff1f..7e1a271 100644 (file)
--- a/sample_set.cc
+++ b/sample_set.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/sample_set.h b/sample_set.h
index 431993d..0540e86 100644 (file)
--- a/sample_set.h
+++ b/sample_set.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/shared.cc b/shared.cc
index a081a68..4d5a878 100644 (file)
--- a/shared.cc
+++ b/shared.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/shared.h b/shared.h
index 6639535..3e093d8 100644 (file)
--- a/shared.h
+++ b/shared.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/shared_responses.cc b/shared_responses.cc
index 94de448..7c1a870 100644 (file)
--- a/shared_responses.cc
+++ b/shared_responses.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/shared_responses.h b/shared_responses.h
index 365f902..c72e6f0 100644 (file)
--- a/shared_responses.h
+++ b/shared_responses.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/storable.cc b/storable.cc
index 4a2786c..33149e5 100644 (file)
--- a/storable.cc
+++ b/storable.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/storable.h b/storable.h
index bf71654..8431d94 100644 (file)
--- a/storable.h
+++ b/storable.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tools.cc b/tools.cc
index 2491fbc..f8d7301 100644 (file)
--- a/tools.cc
+++ b/tools.cc
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tools.h b/tools.h
index 632b2d3..e5347f2 100644 (file)
--- a/tools.h
+++ b/tools.h
@@ -9,9 +9,8 @@
  *  This file is part of folded-ctf.
  *
  *  folded-ctf is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published
- *  by the Free Software Foundation, either version 3 of the License,
- *  or (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
  *
  *  folded-ctf is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of