summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanagiotis Papadopoulos <pano_90@gmx.net>2009-12-13 15:10:14 +0100
committerPanagiotis Papadopoulos <pano_90@gmx.net>2009-12-13 15:10:14 +0100
commit4bd2a2080df3e38a8af12004eae6fcecb33e965a (patch)
tree3db9f3bce5434b23515da24323d765addc395a71
parentMerge branch 'master' of git://gitorious.org/rekonq/mainline into strings (diff)
parentset a valid e-mail adress for me (diff)
downloadrekonq-4bd2a2080df3e38a8af12004eae6fcecb33e965a.tar.xz
Merge branch 'master' of git://gitorious.org/rekonq/mainline into strings
-rw-r--r--AUTHORS2
-rw-r--r--src/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 825d7912..7815171e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,5 +3,5 @@ Alexandr Domrachev alexandr.domrachev_AT_gmail_DOT_com
Panagiotis Papadopoulos pano_90@gmx.net
Lionel Chauvin megabigbug@yahoo.fr
Johannes Zellner webmaster@nebulon.de
-Matthieu Gicquel matthieu@bureau.home
+Matthieu Gicquel matgic78@gmail.com
Ronny Scholz ronny_scholz@web.de
diff --git a/src/main.cpp b/src/main.cpp
index c0e4b70d..030b8476 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -82,7 +82,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
about.addAuthor(ki18n("Matthieu Gicquel"),
ki18n("Developer, Ideas, Tabloid improvements"),
- "matthieu@bureau.home",
+ "matgic78@gmail.com",
"");
about.addAuthor(ki18n("Ronny Scholz"),