summaryrefslogtreecommitdiffabout
path: root/kdepim-desktop.pro
authorzautrix <zautrix>2005-08-24 18:38:31 (UTC)
committer zautrix <zautrix>2005-08-24 18:38:31 (UTC)
commit2cde25d8061acd536bccd698722952ce8555f5db (patch) (unidiff)
tree70f905e5de57b44c3503883b2f98925d9c92ef8b /kdepim-desktop.pro
parent645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff)
downloadkdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip
kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz
kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2
conflict res fix
Diffstat (limited to 'kdepim-desktop.pro') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions