From 5f9e0ebc6c191a8090067055a07aea45ce65fceb Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sun, 18 Apr 2021 20:12:03 +0700
Subject: [PATCH] v6.12.0-dev

---
 src/base/crypto/Algorithm.cpp | 11 +++++------
 src/base/crypto/Algorithm.h   |  4 ++--
 src/version.h                 |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp
index e9f6b47af..92de31f1d 100644
--- a/src/base/crypto/Algorithm.cpp
+++ b/src/base/crypto/Algorithm.cpp
@@ -6,8 +6,8 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -130,10 +130,9 @@ static AlgoName const algorithm_names[] = {
     { "cryptonight/ccx",           "cn/ccx",           Algorithm::CN_CCX          },
     { "cryptonight/conceal",       "cn/conceal",       Algorithm::CN_CCX          },
 #   ifdef XMRIG_ALGO_CN_FEMTO
-    { "cryptonight/upx2",          "cn/upx2",          Algorithm::CN_UPX2          },
-    // Algo names from other miners
-    { "cn-extremelite/upx2",       "cn/upx2",          Algorithm::CN_UPX2          },
-    { "cryptonight-upx/2",         "cn/upx2",          Algorithm::CN_UPX2          },
+    { "cryptonight/upx2",          "cn/upx2",          Algorithm::CN_UPX2         },
+    { "cn-extremelite/upx2",       nullptr,            Algorithm::CN_UPX2         },
+    { "cryptonight-upx/2",         nullptr,            Algorithm::CN_UPX2         },
 #   endif
 };
 
diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h
index a58fa28fd..b770435de 100644
--- a/src/base/crypto/Algorithm.h
+++ b/src/base/crypto/Algorithm.h
@@ -6,8 +6,8 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/version.h b/src/version.h
index 8e50e8522..aabeb5b67 100644
--- a/src/version.h
+++ b/src/version.h
@@ -28,15 +28,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.11.3-dev"
+#define APP_VERSION   "6.12.0-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com"
 #define APP_KIND      "miner"
 
 #define APP_VER_MAJOR  6
-#define APP_VER_MINOR  11
-#define APP_VER_PATCH  3
+#define APP_VER_MINOR  12
+#define APP_VER_PATCH  0
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)