diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-18 17:49:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-18 17:49:18 +0300 |
| commit | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (patch) | |
| tree | 152c7519b0d9b8fb424af2373ec48db823a85575 /data/help | |
| parent | 62ec17f6e489ec50f17219444468aeb8969dc961 (diff) | |
| parent | 3b999f51c740d0541c53d223518e5e4bb482d996 (diff) | |
| download | manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.gz manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.bz2 manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.xz manaplus-70b520b1e876f9698bb95baa2d274ea289a0c6bd.zip | |
Merge branch 'master' into strippedstripped1.1.9.18
Conflicts:
src/guichan/cliprectangle.cpp
src/guichan/focushandler.cpp
src/guichan/gui.cpp
src/guichan/include/guichan/cliprectangle.hpp
src/guichan/include/guichan/inputevent.hpp
src/guichan/include/guichan/keyevent.hpp
src/guichan/include/guichan/mouseevent.hpp
src/guichan/include/guichan/widgets/button.hpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/include/guichan/widgets/radiobutton.hpp
src/guichan/include/guichan/widgets/slider.hpp
src/guichan/include/guichan/widgets/tab.hpp
src/guichan/include/guichan/widgets/tabbedarea.hpp
src/guichan/include/guichan/widgets/textfield.hpp
src/guichan/include/guichan/widgets/window.hpp
src/guichan/inputevent.cpp
src/guichan/keyevent.cpp
src/guichan/mouseevent.cpp
src/guichan/widget.cpp
src/guichan/widgets/button.cpp
src/guichan/widgets/checkbox.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/radiobutton.cpp
src/guichan/widgets/slider.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textfield.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'data/help')
| -rw-r--r-- | data/help/es/team.txt | 2 | ||||
| -rw-r--r-- | data/help/fr/team.txt | 2 | ||||
| -rw-r--r-- | data/help/ru/team.txt | 2 | ||||
| -rw-r--r-- | data/help/team.txt | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/data/help/es/team.txt b/data/help/es/team.txt index 2310f7023..bb43341ee 100644 --- a/data/help/es/team.txt +++ b/data/help/es/team.txt @@ -27,6 +27,8 @@ ##3== Colaboradores con Artes o Imágenes == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt index 83af8d5c8..6222f48bb 100644 --- a/data/help/fr/team.txt +++ b/data/help/fr/team.txt @@ -27,6 +27,8 @@ ##3== Contribution art ou images == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt index 6faec02f7..0c8470fd1 100644 --- a/data/help/ru/team.txt +++ b/data/help/ru/team.txt @@ -25,6 +25,8 @@ ##3== Художники == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/help/team.txt b/data/help/team.txt index 805aaf33f..d940a1694 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -27,6 +27,8 @@ ##3== Art or images contributors == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> |