diff options
| author | Marco Martin <[email protected]> | 2012-02-03 15:26:27 +0100 |
|---|---|---|
| committer | Marco Martin <[email protected]> | 2012-02-03 15:26:27 +0100 |
| commit | 17af97df2487a46a8b35804b7bf70b46c67ecf80 (patch) | |
| tree | b7c0eef479dc175d3fa212f18eebb49fe1793d1d /src/main.cpp | |
| parent | 452c8b8ec8b18e62ff4bae0e49e3f5002ae2f301 (diff) | |
| parent | a55199684898960a25aa9afc730120660087cb5f (diff) | |
Merge branch 'KDE/4.8'
Conflicts:
konqueror/settings/kio/proxy.desktop
Diffstat (limited to 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions