Merge pull request #2310 from RaiKoHoff/grepWin_Integration

Update grepWinNP3 : catch invalid search path

Versions/build.txt

@@ -1 +1 @@
-2
+3

grepWinNP3/src/SearchDlg.cpp

@@ -804,6 +804,11 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
                     ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_RELATIVEPATH).c_str());
                     break;
                 }
+                if (!PathFileExists(m_searchpath.c_str()))
+                {
+                    ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_PATHNOTEXIST).c_str());
+                    break;
+                }
 
                 m_searchedItems = 0;
                 m_totalitems = 0;

grepWinNP3/src/last/version.h

@@ -6,13 +6,13 @@
 
 //#pragma message(__LOC__"Run the NAnt script to get proper version info")
 
-#define FILEVER         2, 1, 0, 5
-#define PRODUCTVER      2, 1, 0, 6
-#define STRFILEVER      "2.1.0.6\0"
-#define STRPRODUCTVER   "2.1.0.6\0"
+#define FILEVER         2, 1, 0, 7
+#define PRODUCTVER      2, 1, 0, 7
+#define STRFILEVER      "2.1.0.7\0"
+#define STRPRODUCTVER   "2.1.0.7\0"
 
 #define GREPWIN_VERMAJOR     2
 #define GREPWIN_VERMINOR     1
 #define GREPWIN_VERMICRO     0
-#define GREPWIN_VERBUILD     6
-#define GREPWIN_VERDATE      "2020-04-19"
+#define GREPWIN_VERBUILD     7
+#define GREPWIN_VERDATE      "2020-05-04"

grepWinNP3/translations/Afrikaans (Suid-Afrika) [af-ZA].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld meer gevonden"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% wordt vervangen door het pad van het bestand, %line% door de juiste regel, %pattern% met de zoekreeks."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Bahasa Indonesia (Indonesia) [id-ID].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Deutsch (Deutschland) [de-DE].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld mehr Übereinstimmungen"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr "Der Pfad existiert nicht oder es kann nicht darauf zugegriffen werden!"
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% wird durch den Pfad der Datei ersetzt - %line% mit der Zeile, zu der gesprungen wird - %pattern% mit dem Suchbegriff."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Dunkler Modus"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Bitte zunächst den 'Dark Mode' in den Windows System Einstellungen erlauben (>= Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/English (United Kingdom) [en-GB].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/English (United States) [en-US].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Español (España) [es-ES].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld más resultados"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% se reemplaza con la ruta del archivo, %line% por la línea a alcanzar, %pattern% con la cadena de búsqueda"."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Modo oscuro"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Primero, habilite el modo oscuro en la configuración de Windows (> = Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Français (France) [fr-FR].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld autres correspondances"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% est remplacé par le chemin du fichier, %line% par la ligne à atteindre, %pattern% avec la chaîne de recherche."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Mode sombre"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Veuillez d'abord activer le mode sombre dans les paramètres de Windows (> = Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Italiano (Italia) [it-IT].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld ulteriori risultati"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% viene sostituito dal percorso del file, %line% dalla riga a cui saltare, %pattern% dalla stringa cercata."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Modalità scura"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Abilita prima la Modalità scura nelle Impostazioni di Windows (>= Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Magyar (Magyarország) [hu-HU].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld további találat"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% le lesz cserélve a fájl útvonalával, %line% a sorral, ahova ugrik, %pattern% a keresési szöveggel"
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Sötét mód"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Kérem, engedélyezze a sötét módot a Windows rendszerbeállításoknál (>= Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Nederlands (Nederland) [nl-NL].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld meer gevonden"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% wordt vervangen door het pad van het bestand, %line% door de juiste regel, %pattern% met de zoekreeks."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Donkere modus"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Schakel eerst de donkere modus in de Windows-systeeminstellingen in (> = Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "... %ld więcej dopasowań"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% jest zastępowana ścieżką pliku, %line% z linią, aby przejść do, %pattern% with the search string."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Tryb ciemny"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Proszę najpierw włączyć tryb ciemny w ustawieniach systemu Windows (>= Win10 v1803)"
 
 #. Resource IDs: (139)

grepWinNP3/translations/Português (Portugal) [pt-PT].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld mais encontrados"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% é substituído com o caminho do arquivo, %line% a linha para saltar, %pattern% with the search string."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Português Brasileiro (Brasil) [pt-BR].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld mais encontrados"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% é substituído com o caminho do arquivo, %line% a linha para saltar, %pattern% with the search string."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Slovenčina (Slovensko) [sk-SK].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld viac výskytov"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% sa nahrádza cestou k súboru, %line% s riadkom, na ktorý sa má prejsť, %pattern% s hľadaným reťazcom."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Tmavý režim"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Prosím, najskôr v nastaveniach systému Windows povoľte tmavý režim (>= Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Tiếng Việt (Việt Nam) [vi-VN].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Türkçe (Türkiye) [tr-TR].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld daha fazla eşleşme"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% dosyanın yolu, %line% ile atlanacak satırla değiştirilir, %pattern% with the search string."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/Беларуская (Беларусь) [be-BY].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "больш %ld супадзенняў"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% замяняецца на шлях да файла, %line% на нумар радка для переходу, %pattern% на шукаемую фразу."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Цёмная тэма"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Спачатку ўключыце цёмны рэжым у наладах Windows (>= Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/Русский (Pоссия) [ru-RU].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "больше %ld совпадений"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% заменяется на путь к файлу, %line% на номер строки для перехода, %pattern% на искомую фразу."
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "Темная тема"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "Для начала включите темный режим в настройках Windows (>= Win10 v1803)."
 
 #. Resource IDs: (139)

grepWinNP3/translations/日本語 （日本） [ja-JP].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "%ld 以上の一致"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% でファイルのパスと置き換え - %line% で指定した行に移動 - %pattern% で検索語句"
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "ダークモード"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "先に Windows の色の設定から「黒」を選択してください (Win 10 v1803 以上)"
 
 #. Resource IDs: (139)

grepWinNP3/translations/简体中文 （中国） [zh-CN].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr "还有 %ld 个匹配"
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr "%path% 被替换为文件的路径，%line% 被替换为要转至的行号，%pattern% 被替换为查找的字符串。"
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr "暗色模式"
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr "请先在 Windows 设置中启用暗色模式。（>= Win10 v1803）"
 
 #. Resource IDs: (139)

grepWinNP3/translations/繁體中文 （台灣） [zh-TW].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

grepWinNP3/translations/한국어 (대한민국) [ko-KR].lang

@@ -37,6 +37,10 @@ msgstr ""
 msgid "%ld more matches"
 msgstr ""
 
+#. Resource IDs: (160)
+msgid "Path does not exist or is not accessible!"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
 msgstr ""
@@ -139,7 +143,7 @@ msgid "Dark mode"
 msgstr ""
 
 #. Resource IDs: (159)
-msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
+msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
 msgstr ""
 
 #. Resource IDs: (139)

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.504.2"
+    version="5.20.504.3"
     type="win32"
   />
   <description>Notepad3 BETA</description>

src/VersionEx.h

@@ -9,11 +9,11 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 504
-#define VERSION_BUILD 2
+#define VERSION_BUILD 3
 #define SCINTILLA_VER 433
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
 #define VERSION_PATCH BETA
-#define VERSION_COMMIT_ID dkt1-amr
+#define VERSION_COMMIT_ID t7820-rk