merge
This commit is contained in:
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("4.1.1.0")>
|
<Assembly: AssemblyVersion("4.1.1.2")>
|
||||||
<Assembly: AssemblyFileVersion("4.1.1.0")>
|
<Assembly: AssemblyFileVersion("4.1.1.2")>
|
||||||
|
|||||||
2
Aviso/My Project/Resources.Designer.vb
generated
2
Aviso/My Project/Resources.Designer.vb
generated
@@ -1700,7 +1700,7 @@ Namespace My.Resources
|
|||||||
End Property
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die 7.3 ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die 7.4 ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
Public ReadOnly Property UpdaterVersion() As String
|
Public ReadOnly Property UpdaterVersion() As String
|
||||||
Get
|
Get
|
||||||
|
|||||||
@@ -545,7 +545,7 @@
|
|||||||
<value>..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="UpdaterVersion" xml:space="preserve">
|
<data name="UpdaterVersion" xml:space="preserve">
|
||||||
<value>7.3</value>
|
<value>7.4</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="DGS_Instructions_Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="DGS_Instructions_Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\resources\dgs_instructions_import.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>..\resources\dgs_instructions_import.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
|||||||
Reference in New Issue
Block a user