Marc Zinnschlag c2ed475950 disable merge menu item when a merge is already in progress ... (cherry picked from commit 708cacdec4)		2015-11-01 13:23:09 +11:00
..
adjusterwidget.cpp	improved adjuster widget problem reporting	2015-11-01 13:22:54 +11:00
adjusterwidget.hpp
filedialog.cpp
filedialog.hpp
filewidget.cpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
filewidget.hpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
globaldebugprofilemenu.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
globaldebugprofilemenu.hpp
loader.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
loader.hpp
newgame.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
newgame.hpp
operation.cpp	replaced State_Compiling (not requried anymore) with State_Merging	2015-11-01 13:19:56 +11:00
operation.hpp
operations.cpp
operations.hpp
runlogsubview.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
runlogsubview.hpp
sizehint.cpp
sizehint.hpp
startup.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
startup.hpp
subview.cpp
subview.hpp
subviewfactory.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
subviewfactory.hpp
subviewfactoryimp.hpp
view.cpp	disable merge menu item when a merge is already in progress	2015-11-01 13:23:09 +11:00
view.hpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
viewmanager.cpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
viewmanager.hpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00