diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-07 15:12:35 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-07 15:12:35 +0200 |
| commit | 50f7b15d8eae33cfd7963de3ad95680359357abb (patch) | |
| tree | dbbf0f924bba87cee75445e397ac3b8a49b1b788 /src/homepage.h | |
| parent | HomePage style fixes. (diff) | |
| parent | better homepage with nav bar on top (diff) | |
| download | rekonq-50f7b15d8eae33cfd7963de3ad95680359357abb.tar.xz | |
Fixing merge operation
Merge commit 'refs/merge-requests/1715' of git://gitorious.org/rekonq/mainline into matgicMerge
Conflicts:
data/home.html
src/homepage.cpp
Diffstat (limited to 'src/homepage.h')
| -rw-r--r-- | src/homepage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/homepage.h b/src/homepage.h index b1202cb0..73bb5859 100644 --- a/src/homepage.h +++ b/src/homepage.h @@ -48,7 +48,7 @@ public: ~HomePage(); QString rekonqHomePage(const KUrl &url = KUrl("rekonq:home")); - QString homePageMenu(); + QString homePageMenu(KUrl currentUrl); private: QString fillFavorites(); |