Fixed speechPlayer licensing issue.

src/speechPlayer/include/speechPlayer.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYER_H

src/speechPlayer/src/frame.cpp

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #include <cstring>

src/speechPlayer/src/frame.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYER_FRAME_H

src/speechPlayer/src/sample.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYER_SAMPLE_H

src/speechPlayer/src/speechPlayer.cpp

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #include "frame.h"

src/speechPlayer/src/speechPlayer.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYER_H

src/speechPlayer/src/speechWaveGenerator.cpp

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 /*

src/speechPlayer/src/speechWaveGenerator.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYERSPEECHWAVEGENERATOR_H

src/speechPlayer/src/utils.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYER_UTILS_H

src/speechPlayer/src/waveGenerator.h

@@ -3,13 +3,14 @@ This file is a part of the NV Speech Player project.
 URL: https://bitbucket.org/nvaccess/speechplayer
 Copyright 2014 NV Access Limited.
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2.0, 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 3 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 This license can be found at:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+http://www.gnu.org/licenses/gpl.html
 */
 
 #ifndef SPEECHPLAYERWAVEGENERATOR_H