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 /scripts | |
| 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 'scripts')
0 files changed, 0 insertions, 0 deletions