diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
commit | aa05bd3973a2f39f50c14314840f0fe078f16444 (patch) | |
tree | dd21ae094321ca9f0b803379ad7e93a6b065ec10 /.gitignore | |
parent | bk toolbar by default for the next rekonq. (diff) | |
parent | Change from QByteArray to QString in the right way (diff) | |
download | rekonq-aa05bd3973a2f39f50c14314840f0fe078f16444.tar.xz |
Merge branch 'opensearch'
Conflicts:
src/CMakeLists.txt
src/urlbar/urlresolver.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions