Merge branch 'dev'

# Conflicts:
#	src/version.h
This commit is contained in:
XMRig 2017-07-20 00:54:03 +03:00
commit 3d9be9484d
33 changed files with 386 additions and 1511 deletions

View file

@ -27,14 +27,14 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "Monero (XMR) CPU miner"
#define APP_VERSION "2.0.2"
#define APP_VERSION "2.1.0"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com"
#define APP_VER_MAJOR 2
#define APP_VER_MINOR 0
#define APP_VER_BUILD 2
#define APP_VER_MINOR 1
#define APP_VER_BUILD 0
#define APP_VER_REV 0
#ifdef _MSC_VER