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 /data/CMakeLists.txt | |
| 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 '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 34676cf0..bf01a44d 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 category.png + FILES bg2.png bg.png bot.gif busywidget.gif closed.png loading.mng open.png tile.gif top.png webkit-icon.png category.png button.png DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics ) |