Merge commit 'refs/merge-requests/19' of git://gitorious.org/kdevelop/kdevplatform...
authorAleix Pol <aleixpol@kde.org>
Sun, 25 Jul 2010 18:16:16 +0000 (20:16 +0200)
committerAleix Pol <aleixpol@kde.org>
Sun, 25 Jul 2010 18:16:16 +0000 (20:16 +0200)
commit1a05e266c6ce8f019ffc4281dd2f7c12b1e1e9d0
treef9fd7c107662e92295321d6556ea9079f6ecc9f5
parentf2405a393b8a9173d58789374d7f401303390e24
parent9611a4c2ad0f5430f2fa4a69e53e389458426b35
Merge commit 'refs/merge-requests/19' of git://gitorious.org/kdevelop/kdevplatform into integration

Conflicts:
plugins/execute/kdevexecute.desktop
plugins/documentview/kdevdocumentview.desktop
plugins/documentview/settings/kcm_documentview_settings.desktop
shell/settings/kcm_kdev_projectsettings.desktop