diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
| commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
| tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /AUTHORS | |
| parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
| parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
| download | plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip | |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -10,18 +10,20 @@ Maarten Vanraes (AL13N) <maarten.vanraes gmail com> Mihail Barer (Necromonger) <> == Translators == +alastrim (pt) Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) Andrei Karas (4144) <akaras inbox ru> (ru) Bernard Hugonnet (Nard) <> (fr) +Candy (jp) +Derpella (pl) Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -Mihail Barer (Necromonger) <> (ru) +Mihail Barer (Necromonger) <> (ru, jp) +Nina O'Reilly (Reid) <reidyaro gmail com> (fr) Petr Varkoček (pitriss) <> (cs) Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) Yohann Ferreira (Bertram) <bertram cegetel net> (fr) Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) -alastrim -GonzoDark == Art or images contributors == Aline Ferraz de Souza (Freya) <freya.df gmail com> Themes |