diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-14 01:20:06 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-14 01:20:06 +0200 |
commit | deddab4e6b9a3dba88cf22fa0975ad67cb1d03fb (patch) | |
tree | f0392ac95a3d0dbaa0c3cb49dc48e51f09684274 /src/adblock/adblockrule.cpp | |
parent | Merge branch 'master' of gitorious.org:rekonq/mainline (diff) | |
parent | Updated the rekonq doc (diff) | |
download | rekonq-deddab4e6b9a3dba88cf22fa0975ad67cb1d03fb.tar.xz |
Merge commit 'refs/merge-requests/94' of git://gitorious.org/rekonq/mainline into m94
Conflicts:
docs/index.docbook
Diffstat (limited to 'src/adblock/adblockrule.cpp')
0 files changed, 0 insertions, 0 deletions