diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
| commit | c0ad087008856cfc2233b977abfc3f1dcbaccdcc (patch) | |
| tree | adc46abc430793112858ce5d1822d3fe0a395e71 /src/kalman | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kalman')
| -rwxr-xr-x | src/kalman/kalman.5c | 3 | ||||
| -rw-r--r-- | src/kalman/kalman_filter.5c | 3 | ||||
| -rw-r--r-- | src/kalman/kalman_micro.5c | 3 | ||||
| -rw-r--r-- | src/kalman/load_csv.5c | 3 | ||||
| -rw-r--r-- | src/kalman/matrix.5c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/src/kalman/kalman.5c b/src/kalman/kalman.5c index 55fde04c..a91b28d8 100755 --- a/src/kalman/kalman.5c +++ b/src/kalman/kalman.5c @@ -5,7 +5,8 @@ * * This program 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; version 2 of the License. + * 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/kalman/kalman_filter.5c b/src/kalman/kalman_filter.5c index efbbf1ab..b676a47b 100644 --- a/src/kalman/kalman_filter.5c +++ b/src/kalman/kalman_filter.5c @@ -5,7 +5,8 @@ load "matrix.5c" * * This program 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; version 2 of the License. + * 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/kalman/kalman_micro.5c b/src/kalman/kalman_micro.5c index 1b080384..97404e17 100644 --- a/src/kalman/kalman_micro.5c +++ b/src/kalman/kalman_micro.5c @@ -5,7 +5,8 @@ * * This program 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; version 2 of the License. + * 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/kalman/load_csv.5c b/src/kalman/load_csv.5c index 0086c6db..7c6c286e 100644 --- a/src/kalman/load_csv.5c +++ b/src/kalman/load_csv.5c @@ -3,7 +3,8 @@ * * This program 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; version 2 of the License. + * 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/kalman/matrix.5c b/src/kalman/matrix.5c index 667648f5..99a522db 100644 --- a/src/kalman/matrix.5c +++ b/src/kalman/matrix.5c @@ -3,7 +3,8 @@ * * This program 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; version 2 of the License. + * 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 |