Revert "Do not popup a new window when merging. Instead show a progress bar in the...
authorAleix Pol <aleixpol@kde.org>
Thu, 16 Sep 2010 18:34:28 +0000 (20:34 +0200)
committerAleix Pol <aleixpol@kde.org>
Thu, 16 Sep 2010 18:34:28 +0000 (20:34 +0200)
commite2f07e82bc4212f7574b3130a8c62835f20cb8f5
treeb39496f7eb92625494bfde1f459a1cd4fed2ee12
parenta8d2d23db0f6afa56e4ac8ac62a15bfb34aa36ef
Revert "Do not popup a new window when merging. Instead show a progress bar in the same window."

This reverts commit 17ba8a8074809eb0c7c67d669ac53e5fb61120b1.

I didn't like it.
src/app/tasks.cpp
src/app/tasks.h
src/mergedialog.cpp
src/mergedialog.h
src/plasmoid/kanbanplasmoid.cpp
src/plasmoid/kanbanplasmoid.h