diff options
| author | Jekyll Wu <[email protected]> | 2012-01-10 20:09:21 +0800 |
|---|---|---|
| committer | Jekyll Wu <[email protected]> | 2012-01-10 20:09:21 +0800 |
| commit | 1375f8316843a71552a3f67002e323d810170837 (patch) | |
| tree | fb9598636e3fa220f4eb119b952f0969610aa991 /src/settings/additionalinfodialog.cpp | |
| parent | 69f68a2349a6a8ef568ecb0a72f4f0e3f1903144 (diff) | |
| parent | f3a38fc51aab2a2c4e870c73059e9377d2124703 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.8'
Conflicts:
dolphin/src/main.cpp
Diffstat (limited to 'src/settings/additionalinfodialog.cpp')
0 files changed, 0 insertions, 0 deletions