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/kernel/ao_microflight.c | |
parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kernel/ao_microflight.c')
-rw-r--r-- | src/kernel/ao_microflight.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kernel/ao_microflight.c b/src/kernel/ao_microflight.c index f7521f21..f415420d 100644 --- a/src/kernel/ao_microflight.c +++ b/src/kernel/ao_microflight.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 |