summaryrefslogtreecommitdiff
path: root/Aktywator
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2018-02-04 15:05:49 +0100
committeremkael <emkael@tlen.pl>2018-02-04 15:05:49 +0100
commit3ffed804b0db02cbbc365c3fcc7ebd6336fd8247 (patch)
tree6d30524649949cfb93dcd9a3d918fe0eafac526e /Aktywator
parentf8d681f86db438cc2d8749e89d8ef3909ece8ca6 (diff)
parentfa8e46acc24c5cf8b607531684b4c9858e4ebb33 (diff)
Merge branch 'master' of github.com:michzimny/aktywator into upstream
Conflicts: Aktywator/Resources/BuildDate.txt
Diffstat (limited to 'Aktywator')
-rw-r--r--Aktywator/Properties/AssemblyInfo.cs6
-rw-r--r--Aktywator/Resources/BuildDate.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/Aktywator/Properties/AssemblyInfo.cs b/Aktywator/Properties/AssemblyInfo.cs
index 423d93f..e31f26d 100644
--- a/Aktywator/Properties/AssemblyInfo.cs
+++ b/Aktywator/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Michał Zimniewicz")]
[assembly: AssemblyProduct("Aktywator")]
-[assembly: AssemblyCopyright("Copyright © 2011-2017 Michał Zimniewicz")]
+[assembly: AssemblyCopyright("Copyright © 2011-2018 Michał Zimniewicz")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2.0")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
+[assembly: AssemblyVersion("1.1.3.0")]
+[assembly: AssemblyFileVersion("1.1.3.0")]
diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt
index fb76437..a374121 100644
--- a/Aktywator/Resources/BuildDate.txt
+++ b/Aktywator/Resources/BuildDate.txt
@@ -1 +1 @@
-2018-02-04
+2018-02-04