diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-03-03 14:19:43 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-03-03 14:19:43 +0100 |
| commit | 978eb92ddd4479eca1de63f4cd0ac65ca8686265 (patch) | |
| tree | 0f9c412d5d80e49f5222c8036c61b886f6c884e7 /src/application.cpp | |
| parent | Fix compile :/ (diff) | |
| parent | variable names ... (diff) | |
| download | rekonq-978eb92ddd4479eca1de63f4cd0ac65ca8686265.tar.xz | |
Fix merge
Merge commit 'refs/merge-requests/101' of git://gitorious.org/rekonq/mainline into AfterLastFindBarFixes
Conflicts:
src/mainwindow.cpp
Diffstat (limited to 'src/application.cpp')
0 files changed, 0 insertions, 0 deletions