Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
#	SetVersion.cmd
#	Version.h

diff --cc SetVersion.cmd
index e68486b,1e15575..d7ec514
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
- set REVISION=22
- set PATCHLEVEL=2
- set STRPRIVATEBUILD="jp-2"
+ set REVISION=24
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
++set PATCHLEVEL=1
++set STRPRIVATEBUILD="jp-1"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Version.h
index 7a20c9b,c2878b4..014685c
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,22,2\r
- #define PRODUCTVER     2,16,22,2\r
- #define STRFILEVER     "2.16.22.2"\r
- #define STRPRODUCTVER  "2.16.22.2"\r
- #define STRPRIVATEBUILD "jp-2"\r
 -#define FILEVER        2,16,24,0\r
 -#define PRODUCTVER     2,16,24,0\r
 -#define STRFILEVER     "2.16.24.0"\r
 -#define STRPRODUCTVER  "2.16.24.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,24,1\r
++#define PRODUCTVER     2,16,24,1\r
++#define STRFILEVER     "2.16.24.1"\r
++#define STRPRODUCTVER  "2.16.24.1"\r
++#define STRPRIVATEBUILD "jp-1"\r