-
Michael Reeves authored
This reverts commit edc1422c7e023b71e766d4ac368433c9e4064e73. # Conflicts: # src/common.cpp # src/directorymergewindow.cpp # src/fileaccess.cpp # src/kdiff3.cpp # src/kdiff3_part.cpp # src/kdiff3_shell.cpp # src/main.cpp # src/optiondialog.cpp # src/smalldialogs.cpp
1535c52c