Skip to content
  • Michael Reeves's avatar
    Merge branch 'stable' · 67e61da3
    Michael Reeves authored
    Conflicts:
    	CMakeLists.txt
    	src/CMakeLists.txt
    	src/common.cpp
    	src/difftextwindow.cpp
    	src/directorymergewindow.cpp
    	src/main.cpp
    	src/mergeresultwindow.cpp
    	src/optiondialog.cpp
    67e61da3