diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
| commit | 551675cb8284b03a1e43be9d11eda0bab7b70139 (patch) | |
| tree | eed1121d421176f4044e5f38190c767f6b905388 /AUTHORS | |
| parent | ae14594cfa804a89a36312e142498eca7f147cc9 (diff) | |
| parent | d4a407254cfffbb79087c1248650fbaed5d568d8 (diff) | |
| download | mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.gz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.bz2 mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.xz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/graphics.h
src/gui/setup_video.cpp
src/gui/specialswindow.cpp
src/gui/viewport.cpp
src/gui/widgets/container.cpp
src/gui/widgets/container.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -14,7 +14,7 @@ Andrei Karas (4144) <akaras inbox.ru> Andrej Sinicyn <andrej4000 gmail.com> Bernd Wachter (Aard) <bwachter-tmw lart.info> Blue Sans Douze (Blue112) <bluesansdouze gmail.com> -Bjrn Steinbrink (Doener) <b.steinbrink gmx.de> +Björn Steinbrink (Doener) <b.steinbrink gmx.de> Cedric Borgese (moi1392) <cedric.borgese gmail.com> Chuck Miller (Kage) <shadowmil gmail.com> Daniel Bradshaw <daniel+commits the-cell.co.uk> @@ -32,7 +32,7 @@ Guillaume Melquiond (Silene) <guillaume.melquiond gmail.com> Ira Rice (Tametomo) <irarice gmail.com> Jan-Fabian Humann (Mra) <malastare gmx.net> Jared Adams <jaxad0127 gmail.com> -Jos vila <linux javila.net> +José Ávila <linux javila.net> Joshua Langley <joshlangley optusnet.com.au> Kess Vargavind <vargavind gmail.com> Kiyoshi Kyokai <kiyoshi.kyokai gmail.com> @@ -48,7 +48,7 @@ Scott Ellis <quiche_on_a_leash hotmail.co.uk> Simon Edwardsson <simon crossnet.se> Stefan Dombrowski <stefan uni-bonn.de> Steve Cotton <steve s.cotton.clara.co.uk> -Thorbjrn Lindeijer <thorbjorn lindeijer.nl> +Thorbjørn Lindeijer <thorbjorn lindeijer.nl> Maximilian Philipps <Turmfalke2007 web.de> Yohann Ferreira <yohann ferreira orange fr> @@ -69,7 +69,7 @@ Matthias Hartmann (German) <hartmann.matthias gmail.com> Natsuki Sumon (Spanish) <natsuki.sumon gmail.com> Rodrigo Chaparro (Spanish) <chapa.com hotmail.es> Sini Ruohomaa (Finnish) <sini.ruohomaa iki.fi> -Thorbjrn Lindeijer (Dutch) <thorbjorn lindeijer.nl> +Thorbjørn Lindeijer (Dutch) <thorbjorn lindeijer.nl> Yohann Ferreira (French) <yohann ferreira orange fr> == Other contributors == |