diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-21 11:38:46 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-21 11:38:46 +0200 |
| commit | 719cda157b81fcebdeb35a9c5d8c075e112c4e40 (patch) | |
| tree | b751ae1b465e6fc945af09cda5ab383ba72403f0 /src/application.h | |
| parent | Me stupid.. fixing tab previews! (diff) | |
| parent | fix button (diff) | |
| download | rekonq-719cda157b81fcebdeb35a9c5d8c075e112c4e40.tar.xz | |
Fixing merge due to recent changes in master
Merge commit 'refs/merge-requests/1836' of git://gitorious.org/rekonq/mainline into NewHomePageSytle
Conflicts:
src/homepage.cpp
Diffstat (limited to 'src/application.h')
0 files changed, 0 insertions, 0 deletions