diff options
author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:05:33 +0100 |
---|---|---|
committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:10:14 +0100 |
commit | 11769558f3f9107c45457ba7c735a1991e42f625 (patch) | |
tree | ffd7057c77794364291a030aa73aa534fb0ea863 /docs/webshortcuts.png | |
parent | Remove the destructor of MainView (diff) | |
parent | Fix markup: (diff) | |
download | rekonq-11769558f3f9107c45457ba7c735a1991e42f625.tar.xz |
Merge branch 'master' of git://git.kde.org/rekonq
Conflicts:
src/mainview.cpp
src/mainview.h
src/webtab.cpp
src/webtab.h
Diffstat (limited to 'docs/webshortcuts.png')
-rw-r--r-- | docs/webshortcuts.png | bin | 69410 -> 29739 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/webshortcuts.png b/docs/webshortcuts.png Binary files differindex 8e3dec06..42add7ab 100644 --- a/docs/webshortcuts.png +++ b/docs/webshortcuts.png |