The conflict editor works again.
authorPhilipp Spitzer <philipp@spitzer.priv.at>
Mon, 17 Oct 2011 19:04:20 +0000 (19:04 +0000)
committerPhilipp Spitzer <philipp@spitzer.priv.at>
Mon, 17 Oct 2011 19:04:20 +0000 (19:04 +0000)
commitc81f30a36004277e8f521ff6877662b59695c5d3
tree3528aa42d684d6da8d3dc17a8074adccfb77ebde
parentdc66a9113c07a4682c6036157dbc0f3708c4af82
The conflict editor works again.
src/gui/conflictdialogcontainer.cpp
src/gui/conflictdialogcontainer.h
src/gui/conflictsdialog.cpp
src/gui/conflictsdialog.h
src/gui/eventdialog.cpp
src/gui/eventdialog.h
src/gui/tabcontainer.cpp