Merge branch 'master' into develop

This commit is contained in:
Nicola Pievani
2024-07-17 15:45:57 +02:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -228,8 +228,8 @@ Public Class MainWindowM
' Verifico abilitazione nesting automatico
m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2604, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2604, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2606, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2606, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
' Inizializzazione generale di EgtInterface
+2 -2
View File
@@ -69,6 +69,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.4.1")>
<Assembly: AssemblyFileVersion("2.6.4.1")>
<Assembly: AssemblyVersion("2.6.6.3")>
<Assembly: AssemblyFileVersion("2.6.6.3")>