summaryrefslogtreecommitdiff
path: root/src/history/historypanel.cpp
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-11-20 19:05:33 +0100
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-11-20 19:10:14 +0100
commit11769558f3f9107c45457ba7c735a1991e42f625 (patch)
treeffd7057c77794364291a030aa73aa534fb0ea863 /src/history/historypanel.cpp
parentRemove the destructor of MainView (diff)
parentFix markup: (diff)
downloadrekonq-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 'src/history/historypanel.cpp')
0 files changed, 0 insertions, 0 deletions