Merge remote-tracking branch 'refs/remotes/xmrig/master'

Conflicts:
	CHANGELOG.md
	src/version.h
This commit is contained in:
Ben Gräf 2017-10-25 14:14:05 +02:00
commit 8e29430c75
2 changed files with 5 additions and 2 deletions

View file

@ -42,7 +42,7 @@
#define APP_VER_MAJOR 2
#define APP_VER_MINOR 4
#define APP_VER_BUILD 1
#define APP_VER_BUILD 2
#define APP_VER_REV 0
#ifdef _MSC_VER