Description: Fix copyright notices
 Vocoder and ZynAddSubFX are under GPL-2+. See
 https://github.com/LMMS/lmms/issues/2366 and
 https://github.com/LMMS/lmms/issues/2752 for more details.
Author: Javier Serrano Polo <javier@jasp.net>
Forwarded: https://github.com/LMMS/lmms/pull/2765
Applied-Upstream: 1.1.91

Index: lmms-1.1.3/plugins/LadspaEffect/swh/vocoder_1337.c
===================================================================
--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/vocoder_1337.c	2016-05-17 00:31:09.000000000 +0200
+++ lmms-1.1.3/plugins/LadspaEffect/swh/vocoder_1337.c	2016-05-17 00:31:24.000000000 +0200
@@ -24,7 +24,7 @@
    Licence: GPL
    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, either version 3 of the License, or
+    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,
Index: lmms-1.1.3/plugins/zynaddsubfx/README.txt
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/README.txt	2016-05-16 21:26:58.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/README.txt	2016-05-16 21:29:56.000000000 +0200
@@ -3,7 +3,7 @@
 It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
 Copyright (c) 2002-2009 Nasca Octavian Paul and others contributors
 e-mail: zynaddsubfx AT yahoo D0T com
-ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
+ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING.
 
     --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==--
               --==## MADE WITH ZynAddSubFX ##==--
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/README.txt
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/README.txt	2016-05-17 00:37:25.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/README.txt	2016-05-17 00:38:01.000000000 +0200
@@ -3,7 +3,7 @@
 It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
 Copyright (c) 2002-2014 Nasca Octavian Paul and others contributors
 e-mail: zynaddsubfx AT yahoo D0T com
-ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
+ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING.
 
     --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==--
               --==## MADE WITH ZynAddSubFX ##==--
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp	2016-05-17 01:39:43.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h	2016-05-17 01:39:43.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h	2016-05-17 01:40:09.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp	2016-05-17 01:39:43.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h	2016-05-17 01:39:43.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp	2016-05-17 01:39:44.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -15,8 +15,9 @@
   DSP analog modeling theory & practice largely influenced by various CCRMA publications, particularly works by Julius O. Smith.
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h	2016-05-17 01:40:09.000000000 +0200
@@ -10,8 +10,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Harald Hvaal
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h	2016-05-17 01:39:45.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Lars Luthman
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Lars Luthman
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -33,8 +33,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h	2016-05-17 01:40:09.000000000 +0200
@@ -33,8 +33,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -4,8 +4,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h	2016-05-17 01:39:46.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h	2016-05-17 01:40:09.000000000 +0200
@@ -7,8 +7,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h	2016-05-17 01:40:09.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp	2016-05-17 00:38:41.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp	2016-05-17 00:38:51.000000000 +0200
@@ -7,7 +7,7 @@
     This file is part of ZynAddSubFX, which 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.
+    version 2 of the License, or (at your option) any later version.
 
     ZynAddSubFX is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h	2016-05-17 00:38:41.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h	2016-05-17 00:38:57.000000000 +0200
@@ -7,7 +7,7 @@
     This file is part of ZynAddSubFX, which 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.
+    version 2 of the License, or (at your option) any later version.
 
     ZynAddSubFX is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp	2016-05-17 01:40:09.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp	2016-05-17 00:38:41.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp	2016-05-17 00:39:02.000000000 +0200
@@ -6,7 +6,7 @@
     This file is part of yoshimi, which 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.
+    version 2 of the License, or (at your option) any later version.
 
     yoshimi is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h	2016-05-17 00:38:41.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h	2016-05-17 00:39:09.000000000 +0200
@@ -6,7 +6,7 @@
     This file is part of yoshimi, which 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.
+    version 2 of the License, or (at your option) any later version.
 
     yoshimi is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h	2016-05-17 01:40:10.000000000 +0200
@@ -8,8 +8,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -3,8 +3,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h	2016-05-17 01:39:47.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h	2016-05-17 01:40:10.000000000 +0200
@@ -7,8 +7,9 @@
           Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp	2016-05-17 01:39:48.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h	2016-05-17 01:39:49.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -7,8 +7,9 @@
   Authors: Mark McCurry, Harald Hvaal
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -7,8 +7,9 @@
   Authors: Mark McCurry, Harald Hvaal
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: zco
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Authors: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -7,8 +7,9 @@
   Authors: Mark McCurry, Harald Hvaal
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/globals.h
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/globals.h	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/globals.h	2016-05-17 01:40:10.000000000 +0200
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   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
Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp
===================================================================
--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp	2016-05-17 01:39:50.000000000 +0200
+++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp	2016-05-17 01:40:10.000000000 +0200
@@ -6,8 +6,9 @@
   Copyright (C) 2012-2014 Mark McCurry
 
   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
