gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-08-13 18:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master fixed conflict.

Browse Source
This commit is contained in:
DW
2017-01-05 21:36:55 +02:00
parent 1c269f7339 4a7bb6f2cb
commit 5b76bf0547
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTApiService/Properties/AssemblyInfo.cs
Executable → Regular
+1 -1
View File
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.25.0")] [assembly: AssemblyVersion("1.0.25.0")]
[assembly: AssemblyFileVersion("1.0.25.0")] [assembly: AssemblyFileVersion("1.0.25.0")]
MtApi/Properties/AssemblyInfo.cs
Executable → Regular
+1 -1
View File
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.33.0")] [assembly: AssemblyVersion("1.0.33.0")]
[assembly: AssemblyFileVersion("1.0.33.0")] [assembly: AssemblyFileVersion("1.0.33.0")]
MtApi5/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.11.0")] [assembly: AssemblyVersion("1.0.11.1")]
[assembly: AssemblyFileVersion("1.0.11.0")] [assembly: AssemblyFileVersion("1.0.11.1")]