diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-07-31 15:30:31 +0200 | 
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-07-31 15:30:31 +0200 | 
| commit | 9db0139f25307b9e57ddd10a286f6a217912ef20 (patch) | |
| tree | 9c4e0882688ce4aee1e8fc0feab21f07e045e2dc | |
| parent | fix stop/reload button initialization (diff) | |
| parent | Added AdriĆ Arrufat to the credits (diff) | |
| download | rekonq-9db0139f25307b9e57ddd10a286f6a217912ef20.tar.xz | |
Merge branch 'ICON'
| -rw-r--r-- | data/loading.mng | bin | 4257 -> 3332 bytes | |||
| -rw-r--r-- | src/main.cpp | 11 | 
2 files changed, 8 insertions, 3 deletions
| diff --git a/data/loading.mng b/data/loading.mngBinary files differ index 3ecc0e09..0e490c4b 100644 --- a/data/loading.mng +++ b/data/loading.mng diff --git a/src/main.cpp b/src/main.cpp index 98b5e5ca..7563c0b7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -82,19 +82,24 @@ int main(int argc, char **argv)      about.addCredit(ki18n("Abuus"),                      ki18n("Webview  mouse event support"), -                    "hdevalence@gmail.com", +                    "buusmail@gmail.com",                      "");      about.addCredit(ki18n("Johannes Zellner"),                      ki18n("Patches, suggestions, testing, bugfixing"), -                    "hdevalence@gmail.com", +                    "webmaster@nebulon.de",                      "");      about.addCredit(ki18n("Ivan Cukic"),                      ki18n("Patches, bugfixing"),                      "ivan@fomentgroup.org",                      ""); -                     + +    about.addCredit(ki18n("AdriĆ  Arrufat"), +                    ki18n("New tab loading animation"), +                    "swiftscythe@gmail.com", +                    ""); +                         // Initialize command line args      KCmdLineArgs::init(argc, argv, &about); | 
