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 /libaltos | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'libaltos')
| -rw-r--r-- | libaltos/libaltos.h | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_common.c | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_darwin.c | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_linux.c | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_posix.c | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_posix.h | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_private.h | 3 | ||||
| -rw-r--r-- | libaltos/libaltos_windows.c | 3 |
8 files changed, 16 insertions, 8 deletions
diff --git a/libaltos/libaltos.h b/libaltos/libaltos.h index 6d43159b..8c49346f 100644 --- a/libaltos/libaltos.h +++ b/libaltos/libaltos.h @@ -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/libaltos/libaltos_common.c b/libaltos/libaltos_common.c index 090f03ad..dfafcc7a 100644 --- a/libaltos/libaltos_common.c +++ b/libaltos/libaltos_common.c @@ -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/libaltos/libaltos_darwin.c b/libaltos/libaltos_darwin.c index 04194d9a..c6b6355f 100644 --- a/libaltos/libaltos_darwin.c +++ b/libaltos/libaltos_darwin.c @@ -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/libaltos/libaltos_linux.c b/libaltos/libaltos_linux.c index 2065d74a..1cade72d 100644 --- a/libaltos/libaltos_linux.c +++ b/libaltos/libaltos_linux.c @@ -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/libaltos/libaltos_posix.c b/libaltos/libaltos_posix.c index 731e9aa1..bf5d4699 100644 --- a/libaltos/libaltos_posix.c +++ b/libaltos/libaltos_posix.c @@ -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/libaltos/libaltos_posix.h b/libaltos/libaltos_posix.h index dc9bfb62..bf8b71b6 100644 --- a/libaltos/libaltos_posix.h +++ b/libaltos/libaltos_posix.h @@ -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/libaltos/libaltos_private.h b/libaltos/libaltos_private.h index 56f6335b..f8e5231b 100644 --- a/libaltos/libaltos_private.h +++ b/libaltos/libaltos_private.h @@ -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/libaltos/libaltos_windows.c b/libaltos/libaltos_windows.c index 2c3f41e1..e53aa72b 100644 --- a/libaltos/libaltos_windows.c +++ b/libaltos/libaltos_windows.c @@ -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 |