Replaced 'GNU Public License' with the correct 'GNU General Public License'.

Thanks to Teemu Hukkanen for the hint!

Visual.Studio/VisualStudioFix.c

@@ -1,8 +1,8 @@
  /*
   * Hatari - Fix for compliation using Visual Studio 6
   *
-  * This file is distributed under the GNU Public License, version 2 or at
-  * your option any later version. Read the file gpl.txt for details.
+  * This file is distributed under the GNU General Public License, version 2
+  * or at your option any later version. Read the file gpl.txt for details.
   */
 
 #if defined(_VCWIN_)
@@ -77,4 +77,4 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
 #ifdef __cplusplus
 }
-#endif
+#endif

Visual.Studio/VisualStudioFix.h

@@ -1,8 +1,8 @@
  /*
   * Hatari - Fix for compliation using Visual Studio 6
   *
-  * This file is distributed under the GNU Public License, version 2 or at
-  * your option any later version. Read the file gpl.txt for details.
+  * This file is distributed under the GNU General Public License, version 2
+  * or at your option any later version. Read the file gpl.txt for details.
   *
   * This file tells Visual Studio to ignore a number of relatively minor "warnings" that have found their
   * way into the HAtari source. None of the "warnings" will hamper the running or compliation or HAtari 

src/audio.c

@@ -1,8 +1,8 @@
 /*
   Hatari - audio.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This file contains the routines which pass the audio data to the SDL library.
 */

src/avi_record.c

@@ -1,8 +1,8 @@
 /*
   Hatari - avi_record.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   AVI File recording
 

src/bios.c

@@ -1,8 +1,8 @@
 /*
   Hatari - bios.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Bios Handler (Trap #13)
 

src/blitter.c

@@ -1,8 +1,8 @@
 /*
  * Hatari - blitter.c
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  *
  * Blitter emulation. The 'Blitter' chip is found in the Mega-ST, STE/Mega-STE
  * and Falcon. It provides a very fast BitBlit function in hardware.

src/cart.c

@@ -1,8 +1,8 @@
 /*
   Hatari - cart.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Cartridge program
 

src/cartData.c

@@ -1,8 +1,8 @@
 /*
   Hatari - cartData.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   The assembled cartridge Pexec() program (source code can be found in the
   file cart_asm.s).

src/change.c

@@ -1,8 +1,8 @@
 /*
   Hatari - change.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This code handles run-time configuration changes. We keep all our
   configuration details in a structure called 'ConfigureParams'.  Before

src/clocks_timings.c

@@ -1,8 +1,8 @@
 /*
   Hatari - clocks_timings.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Clocks Timings for the hardware components in each supported machine type,
   as well as functions taking into account the exact length of a VBL to

src/configuration.c

@@ -1,8 +1,8 @@
 /*
   Hatari - configuration.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Configuration File
 

src/control.c

@@ -1,8 +1,8 @@
 /*
   Hatari - control.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This code processes commands from the Hatari control socket
 */

src/convert/high640x8.c

@@ -1,8 +1,8 @@
 /*
   Hatari - high640x8.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, High Res to 640x8Bit
 */

src/convert/low320x16.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low320x16.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Low Res to 320x16Bit
 */

src/convert/low320x16_spec.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low320x16_spec.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Low Res Spec512 to 320x16Bit
 */

src/convert/low320x32.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low320x32.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Low Res to 320x32Bit
 */

src/convert/low320x32_spec.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low320x32_spec.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Low Res Spec512 to 320x32Bit
 */

src/convert/low320x8.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low320x8.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen conversion function, Low Res to 320x8Bit
 */

src/convert/low640x16.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low640x16.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Low Res to 640x16Bit
 */

src/convert/low640x16_spec.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low640x16_spec.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen conversion, Low Res Spec512 to 640x16Bit
 */

src/convert/low640x32.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low640x32.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Low Res to 640x32Bit
 */

src/convert/low640x32_spec.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low640x32_spec.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen conversion, Low Res Spec512 to 640x32Bit
 */

src/convert/low640x8.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low640x8.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen conversion function, Low Res to 640x8Bit
 */

src/convert/macros.h

@@ -3,8 +3,8 @@
   
   Lookup tables and macros for screen conversion routines.
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_CONVERTMACROS_H

src/convert/med640x16.c

@@ -1,8 +1,8 @@
 /*
   Hatari - low320x8.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Medium Res to 640x16Bit
 */

src/convert/med640x16_spec.c

@@ -1,8 +1,8 @@
 /*
   Hatari - med640x16_spec.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Medium Res Spec512 to 640x16Bit
 */

src/convert/med640x32.c

@@ -1,8 +1,8 @@
 /*
   Hatari - med640x32.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Medium Res to 640x32Bit
 */

src/convert/med640x32_spec.c

@@ -1,8 +1,8 @@
 /*
   Hatari - med640x32_spec.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, Medium Res Spec512 to 640x32Bit
 */

src/convert/med640x8.c

@@ -1,8 +1,8 @@
 /*
   Hatari - med640x8.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen conversion, Medium Res to 640x8Bit
 */

src/convert/routines.h

@@ -3,8 +3,8 @@
   
   Definitions for the screen conversion routines
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_CONVERTROUTINES_H

src/convert/vdi16.c

@@ -1,8 +1,8 @@
 /*
   Hatari - vdi16.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, VDI resolution with 16 colors
 */

src/convert/vdi2.c

@@ -1,8 +1,8 @@
 /*
   Hatari - vdi2.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, monochrome VDI resolution
 */

src/convert/vdi4.c

@@ -1,8 +1,8 @@
 /*
   Hatari - vdi4.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, VDI resolution with 4 colors
 */

src/cpu/compat.h

@@ -1,12 +1,12 @@
 /*
   Hatari - compat.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
-  This file contains all the includes and defines specific to windows (such as TCHAR)
-  needed by WinUae CPU core. 
-  The aim is to have minimum changes in WinUae CPU core for next updates
+  This file contains all the includes and defines specific to windows (such as
+  TCHAR) needed by WinUAE CPU core.
+  The aim is to have minimum changes in WinUae CPU core for next updates.
 */
 
 #ifndef HATARI_COMPAT_H

src/cpu/hatari-glue.c

@@ -1,8 +1,8 @@
 /*
   Hatari - hatari-glue.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This file contains some code to glue the UAE CPU core to the rest of the
   emulator and Hatari's "illegal" opcodes.

src/cpu/hatari-glue.h

@@ -1,8 +1,8 @@
 /*
   Hatari - hatari-glue.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_GLUE_H

src/cpu/maccess.h

@@ -7,8 +7,8 @@
   *
   * Adaptation to Hatari by Thomas Huth, Eero Tamminen
   *
-  * This file is distributed under the GNU Public License, version 2 or at
-  * your option any later version. Read the file gpl.txt for details.
+  * This file is distributed under the GNU General Public License, version 2
+  * or at your option any later version. Read the file gpl.txt for details.
   */
 
 #ifndef UAE_MACCESS_H

src/cpu/memory.c

@@ -7,8 +7,8 @@
   *
   * Adaptation to Hatari by Thomas Huth
   *
-  * This file is distributed under the GNU Public License, version 2 or at
-  * your option any later version. Read the file gpl.txt for details.
+  * This file is distributed under the GNU General Public License, version 2
+  * or at your option any later version. Read the file gpl.txt for details.
   */
 const char Memory_fileid[] = "Hatari memory.c : " __DATE__ " " __TIME__;
 

src/cpu/memory.h

@@ -7,8 +7,8 @@
   *
   * Adaptation to Hatari by Thomas Huth
   *
-  * This file is distributed under the GNU Public License, version 2 or at
-  * your option any later version. Read the file gpl.txt for details.
+  * This file is distributed under the GNU General Public License, version 2
+  * or at your option any later version. Read the file gpl.txt for details.
   */
 
 #ifndef UAE_MEMORY_H

src/cpu/options_cpu.h

@@ -1,8 +1,8 @@
 /*
   Hatari - options_cpu.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef OPTIONS_CPU_H

src/cpu/sysconfig.h

@@ -1,8 +1,8 @@
 /*
   Hatari - sysconfig.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This file contains needed auto generated includes and defines needed by WinUae CPU core.
   The aim is to have minimum changes in WinUae CPU core for next updates

src/createBlankImage.c

@@ -1,8 +1,8 @@
 /*
   Hatari - createBlankImage.c
  
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
  
   Create blank .ST/.MSA disk images.
 */

src/cycInt.c

@@ -1,8 +1,8 @@
 /*
   Hatari - cycInt.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This code handles our table with callbacks for cycle accurate program
   interruption. We add any pending callback handler into a table so that we do

src/cycles.c

@@ -1,8 +1,8 @@
 /*
   Hatari - cycles.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Here we take care of cycle counters. For performance reasons we don't increase
   all counters after each 68k instruction, but only one main counter.

src/debug/68kDisass.c

@@ -1,8 +1,8 @@
 /***
  *	68k disassembler, written 2010 by Markus Fritze, www.sarnau.com
  *	
- *	This file is distributed under the GNU Public License, version 2 or at
- *	your option any later version. Read the file gpl.txt for details.
+ *	This file is distributed under the GNU General Public License, version 2
+ *	or at your option any later version. Read the file gpl.txt for details.
  ***/
 
 #include <stdio.h>

src/debug/68kDisass.h

@@ -1,8 +1,8 @@
 /*
   Hatari - 68kDisass.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 #ifndef HATARI_68KDISASS_H
 #define HATARI_68KDISASS_H

src/debug/breakcond.c

@@ -3,8 +3,8 @@
 
   Copyright (c) 2009-2010 by Eero Tamminen
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   breakcond.c - code for breakpoint conditions that can check variable
   and memory values against each other, mask them etc. before deciding

src/debug/breakcond.h

@@ -1,8 +1,8 @@
 /*
   Hatari - breakcond.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_BREAKCOND_H

src/debug/console.c

@@ -3,8 +3,8 @@
  * 
  * Copyright (C) 2012 by Eero Tamminen
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  *
  * console.c - catching of emulated console output with minimal VT52 emulation.
  */

src/debug/console.h

@@ -1,8 +1,8 @@
 /*
  * Hatari - profile.h
  * 
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  */
 
 #ifndef HATARI_CONSOLE_H

src/debug/debugInfo.c

@@ -1,8 +1,8 @@
 /*
   Hatari - debuginfo.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   debuginfo.c - functions needed to show info about the atari HW & OS
    components and "lock" that info to be shown on entering the debugger.

src/debug/debugInfo.h

@@ -1,8 +1,8 @@
 /*
   Hatari - debugInfo.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Public atari components debugging infos header.
 */

src/debug/debug_priv.h

@@ -1,8 +1,8 @@
 /*
   Hatari - debug.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Internal header used by debugger files.
 */

src/debug/debugcpu.c

@@ -1,8 +1,8 @@
 /*
   Hatari - debugcpu.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   debugcpu.c - function needed for the CPU debugging tasks like memory
   and register dumps.

src/debug/debugcpu.h

@@ -1,8 +1,8 @@
 /*
   Hatari - debugcpu.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Public CPU debugging header.
 */

src/debug/debugdsp.c

@@ -1,8 +1,8 @@
 /*
   Hatari - debugdsp.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   debugdsp.c - function needed for the DSP debugging tasks like memory
   and register dumps.

src/debug/debugdsp.h

@@ -1,8 +1,8 @@
 /*
   Hatari - debugdsp.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Public DSP debugging header file.
 */

src/debug/debugui.c

@@ -1,8 +1,8 @@
 /*
   Hatari - debugui.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   debugui.c - this is the code for the mini-debugger. When the pause button is
   pressed, the emulator is (hopefully) halted and this little CLI can be used

src/debug/debugui.h

@@ -1,8 +1,8 @@
 /*
   Hatari - debugui.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Public debugger UI header file.
 */

src/debug/evaluate.c

@@ -3,8 +3,8 @@
 
   Copyright (C) 1994, 2009-2010 by Eero Tamminen
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   calculate.c - parse numbers, number ranges and expressions. Supports
   most unary and binary operations. Parenthesis are used for indirect

src/debug/evaluate.h

@@ -1,8 +1,8 @@
 /*
   Hatari - evaluate.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_EVALUATE_H

src/debug/history.c

@@ -3,8 +3,8 @@
  * 
  * Copyright (C) 2011 by Eero Tamminen
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  *
  * history.c - functions for debugger entry & breakpoint history
  */

src/debug/history.h

@@ -1,8 +1,8 @@
 /*
   Hatari - history.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_HISTORY_H

src/debug/log.c

@@ -1,8 +1,8 @@
 /*
  * Hatari - log.c
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  *
  * Logger functions.
  *

src/debug/log.h

@@ -1,8 +1,8 @@
 /*
   Hatari - log.h
   
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 #ifndef HATARI_LOG_H
 #define HATARI_LOG_H

src/debug/profile.c

@@ -3,8 +3,8 @@
  * 
  * Copyright (C) 2010 by Eero Tamminen
  *
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  *
  * profile.c - functions for profiling CPU and DSP and showing the results.
  */

src/debug/profile.h

@@ -1,8 +1,8 @@
 /*
  * Hatari - profile.h
  * 
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  */
 
 #ifndef HATARI_PROFILE_H

src/debug/symbols.c

@@ -3,8 +3,8 @@
  * 
  * Copyright (C) 2010 by Eero Tamminen
  * 
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  * 
  * symbols.c - Hatari debugger symbol/address handling; parsing, sorting,
  * matching, TAB completion support etc.

src/debug/symbols.h

@@ -1,8 +1,8 @@
 /*
  * Hatari - symbols.h
  * 
- * This file is distributed under the GNU Public License, version 2 or at
- * your option any later version. Read the file gpl.txt for details.
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
  */
 
 #ifndef HATARI_SYMBOLS_H

src/dialog.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dialog.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Code to handle our options dialog.
 */

src/dim.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dim.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   DIM disk image support.
 */

src/dmaSnd.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dmaSnd.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   STE DMA sound emulation. Does not seem to be very hard at first glance,
   but since the DMA sound has to be mixed together with the PSG sound and

src/falcon/crossbar.c

@@ -1,8 +1,8 @@
 /*
   Hatari - Crossbar.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Falcon Crossbar (Matrice) emulation.
   input device:	

src/falcon/crossbar.h

@@ -1,8 +1,8 @@
 /*
   Hatari - crossbar.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_CROSSBAR_H

src/falcon/hostscreen.c

@@ -1,8 +1,8 @@
 /*
   Hatari - hostscreen.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Host video routines. This file originally came from the Aranym project but
   has been thoroughly reworked for Hatari. However, integration with the rest

src/falcon/hostscreen.h

@@ -1,8 +1,8 @@
 /*
   Hatari - hostscreen.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_HOSTSCREEN_H

src/falcon/microphone.c

@@ -2,8 +2,8 @@
   Hatari - microphone.c
   microphone (jack connector) emulation (Falcon mode only)
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This program uses the PortAudio Portable Audio Library.
   For more information see: http://www.portaudio.com

src/falcon/microphone.h

@@ -1,8 +1,8 @@
 /*
   Hatari - microphone.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_MICROPHONE_H

src/falcon/nvram.c

@@ -1,8 +1,8 @@
 /*
   Hatari - nvram.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This file is partly based on GPL code taken from the Aranym project.
   - Copyright (c) 2001-2004 Petr Stehlik of ARAnyM dev team

src/falcon/nvram.h

@@ -1,8 +1,8 @@
 /*
   Hatari - nvram.h
  
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Atari TT and Falcon NVRAM and RTC emulation code - declarations
 */

src/falcon/videl.c

@@ -1,8 +1,8 @@
 /*
   Hatari - videl.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Falcon Videl emulation. The Videl is the graphics shifter chip of the Falcon.
   It supports free programmable resolutions with 1, 2, 4, 8 or 16 bits per

src/falcon/videl.h

@@ -1,8 +1,8 @@
 /*
   Hatari - videl.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_VIDEL_H

src/fdc.c

@@ -1,8 +1,8 @@
 /*
   Hatari - fdc.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Floppy Disk Controller(FDC) emulation.
   All commands are emulated with good timings estimation, as many programs

src/file.c

@@ -1,8 +1,8 @@
 /*
   Hatari - file.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Common file access functions.
 */

src/floppy.c

@@ -1,8 +1,8 @@
 /*
   Hatari - floppy.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   This is where we read/write sectors to/from the disk image buffers.
   NOTE: these buffers are in memory so we only need to write routines for

src/gemdos.c

@@ -1,8 +1,8 @@
 /*
   Hatari - gemdos.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   GEMDOS intercept routines.
   These are used mainly for hard drive redirection of high level file routines.

src/gui-osx/AlertHooks.h

@@ -1,8 +1,8 @@
 /*
   Hatari - AlertHooks.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Hooked alerts, to be used instead of SDL alert windows
 */

src/gui-osx/AlertHooks.m

@@ -1,8 +1,8 @@
 /*
   Hatari - AlertHooks.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Hooked alerts, to be used instead of SDL alert windows
 

src/gui-osx/CreateFloppyController.h

@@ -1,8 +1,8 @@
 /*
   Hatari - CreateFloppyController.m
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #import <Cocoa/Cocoa.h>

src/gui-osx/CreateFloppyController.m

@@ -1,8 +1,8 @@
 /*
   Hatari - CreateFloppyController.m
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Create floppy image window controller implementation file
 

src/gui-osx/PrefsController.h

@@ -1,8 +1,8 @@
 /*
   Hatari - PrefsController.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #import <Cocoa/Cocoa.h>

src/gui-osx/PrefsController.m

@@ -1,8 +1,8 @@
 /*
   Hatari - PrefsController.m
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Preferences window controller implementation file
 

src/gui-osx/Shared.h

@@ -1,8 +1,8 @@
 /*
   Hatari - Shared.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #import <Cocoa/Cocoa.h>

src/gui-osx/Shared.m

@@ -1,8 +1,8 @@
 /*
   Hatari - Shared.m
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Helper code used by the other Cocoa code files
 

src/gui-sdl/dlgAbout.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dlgAbout.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Show information about the program and its license.
 */

src/gui-sdl/dlgDevice.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dlgDevice.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Device (Printer etc.) setup dialog
 */

src/gui-sdl/dlgFileSelect.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dlgFileSelect.c
  
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
  
   A file selection dialog for the graphical user interface for Hatari.
 */

src/gui-sdl/dlgFloppy.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dlgFloppy.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 const char DlgFloppy_fileid[] = "Hatari dlgFloppy.c : " __DATE__ " " __TIME__;
 

src/gui-sdl/dlgHardDisk.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dlgHardDisk.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 const char DlgHardDisk_fileid[] = "Hatari dlgHardDisk.c : " __DATE__ " " __TIME__;
 

src/gui-sdl/dlgJoystick.c

@@ -1,8 +1,8 @@
 /*
   Hatari - dlgJoystick.c
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 const char DlgJoystick_fileid[] = "Hatari dlgJoystick.c : " __DATE__ " " __TIME__;