Merge branch 'develop'

Cambio versione 2.5a1
Merge commit 'd2ff748fe0a5f5477e16a3cba1c79999f03f759d' into develop
2023-01-11 19:58:58 +01:00 · 2023-01-11 19:31:17 +01:00 · 2022-08-25 15:15:32 +02:00
2 changed files with 4 additions and 4 deletions
@@ -202,8 +202,8 @@ Public Class MainWindowM
      Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
      EgtSetNetHwKey( bNetHwKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2407, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2407, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2501, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2501, 1, m_nKeyOptions)
      ' Verifico abilitazione prodotto
      Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
      ' Inizializzazione generale di EgtInterface
@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.4.7.1")>
-<Assembly: AssemblyFileVersion("2.4.7.1")>
+<Assembly: AssemblyVersion("2.5.1.1")>
+<Assembly: AssemblyFileVersion("2.5.1.1")>
Author	SHA1	Message	Date
NicolaP	235537c9f3	Merge branch 'develop'	2023-01-11 19:58:58 +01:00
NicolaP	e034816bed	Cambio versione 2.5a1	2023-01-11 19:31:17 +01:00
NicolaP	5f1d48696f	Merge commit 'd2ff748fe0a5f5477e16a3cba1c79999f03f759d' into develop	2022-08-25 15:15:32 +02:00