diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:32:28 +0200 |
| commit | a4c70a0ffdba0c84664944645b12778f5142320b (patch) | |
| tree | 3087d9447698506dfa61d4f5b6b190f1b15f5616 /src/iconmanager.cpp | |
| parent | Code Review. (diff) | |
| parent | Fix compile again ... (diff) | |
| download | rekonq-a4c70a0ffdba0c84664944645b12778f5142320b.tar.xz | |
Merge commit 'refs/merge-requests/197' of git://gitorious.org/rekonq/mainline into m197
Conflicts:
src/bookmarks/bookmarkprovider.h
I also changed a iconmanager header inclusion :)
Diffstat (limited to 'src/iconmanager.cpp')
0 files changed, 0 insertions, 0 deletions