Merge branch 'master' of gitorious.org:kdevelop/kdevplatform
authorAleix Pol <aleixpol@kde.org>
Fri, 19 Nov 2010 13:53:31 +0000 (14:53 +0100)
committerAleix Pol <aleixpol@kde.org>
Fri, 19 Nov 2010 13:53:31 +0000 (14:53 +0100)
commit47446cb81e81c0cb45a8c77d2cdeff00298bc04d
treed2a7e239509411c149d4aeb001c069a6ceac5258
parent1dd1b94c8426684a7cb102e12df2ad3af8be2c7b
parent0496494928934d136eba5bfffc69fcfc2aa70f4f
Merge branch 'master' of gitorious.org:kdevelop/kdevplatform

Conflicts:
plugins/problemreporter/problemwidget.cpp