diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-03 18:57:33 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-03 18:57:33 +0200 |
| commit | 871cb6f8fd2828260a361265c08c595648510b68 (patch) | |
| tree | fb87b3b2349f712d9db3d08064f943a5beb2ede8 /docs/proxy.png | |
| parent | QLatin1String -> QL1S (diff) | |
| parent | Fixed a minor bug in documentation (diff) | |
| download | rekonq-871cb6f8fd2828260a361265c08c595648510b68.tar.xz | |
Fix conflicts
Merge commit 'refs/merge-requests/2254' of git://gitorious.org/rekonq/mainline into DocsUpdate
Conflicts:
docs/index.docbook
Diffstat (limited to 'docs/proxy.png')
| -rw-r--r-- | docs/proxy.png | bin | 0 -> 73465 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/proxy.png b/docs/proxy.png Binary files differnew file mode 100644 index 00000000..f08dce80 --- /dev/null +++ b/docs/proxy.png |