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 /data/CMakeLists.txt | |
| 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 'data/CMakeLists.txt')
| -rw-r--r-- | data/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9eb59933..34676cf0 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,5 +1,5 @@ INSTALL( - FILES bg.png bot.gif busywidget.gif closed.png loading.mng open.png tile.gif top.png webkit-icon.png + FILES bg.png bot.gif busywidget.gif closed.png loading.mng open.png tile.gif top.png webkit-icon.png category.png DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics ) |