diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
| commit | e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a (patch) | |
| tree | 9d03b385b1eca31487d5df6c0460e335bca6e663 /src/settings/settings_general.ui | |
| parent | removed current bugged adblock implementation. (diff) | |
| parent | clicktoflash : more cleanup (diff) | |
| download | rekonq-e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a.tar.xz | |
Merge commit 'refs/merge-requests/2237' of git://gitorious.org/rekonq/mainline into FLASH
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/settings/settings_general.ui')
0 files changed, 0 insertions, 0 deletions