281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
5 years ago
4158c077cd
Fix: Remove duplicate French and Slovak town names
...
I've replaced some of the duplicate real town names with new real town
names in the French and Slovak sets.
Also, some Slovak town names were missing accents, so I've fixed those.
5 years ago
0bed63b77f
Merge branch 'master' into cpp-11
6 years ago
82e530b517
Fix: Remove duplicate town name "Huacho" ( #7038 )
...
Huacho appears twice in the Spanish town names list. This change removes
the second one, and replaces it with a new one: Medellin.
6 years ago
65746a0275
Fix: Spelling fixes on some Latin American town names
6 years ago
f7af8b8bdc
Silence -Wunused-variable warnings in src/table/townname.h
8 years ago
fddeeb5e49
(svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param
10 years ago
26574124b1
(svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param
10 years ago
5cc4d240f1
(svn r25775) -Fix [FS#5746]: Some spelling corrections to Catalan town names (juanjo)
11 years ago
68486be675
(svn r25775) -Fix [FS#5746]: Some spelling corrections to Catalan town names (juanjo)
11 years ago
eecb4b3506
(svn r25774) -Fix [FS#5746]: Some spelling corrections to Latin American town names (juanjo)
11 years ago
768d0ac008
(svn r25774) -Fix [FS#5746]: Some spelling corrections to Latin American town names (juanjo)
11 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
17e6201d33
(svn r20787) -Fix: Spelling mistake in slovak real town names. (mek2)
14 years ago
9aba4a66b6
(svn r20787) -Fix: Spelling mistake in slovak real town names. (mek2)
14 years ago
53aaabe6e9
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
d2e99657fa
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
662ef3173b
(svn r17597) -Codechange: rename namegen* to townname*
15 years ago
a9d0dde464
(svn r17597) -Codechange: rename namegen* to townname*
15 years ago
Jonathan G Rennison
Nikolas Nyby
rubidium
planetmaker
frosch
smatz