Merge branch 'release-2.2.3'

Update copyright year on home page.
Update version info file.
2016-03-30 14:11:57 +02:00 · 2016-03-30 14:11:49 +02:00 · 2016-03-30 14:11:03 +02:00 · 2016-03-30 14:08:15 +02:00 · 2016-03-30 14:02:33 +02:00 · 2016-03-30 13:59:43 +02:00
6 changed files with 16 additions and 8 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,3 +1,11 @@
 Version 2.2.3 (2016-03-30)
 ========================================================================
 - REPARIERT: Installationsskript hat Add-in nicht aktiviert.
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
 Version 2.2.2 (2016-03-29)
 ========================================================================
--- a/deploy/VstoAddinInstaller
+++ b/deploy/VstoAddinInstaller
--- a/deploy/make-installer.iss
+++ b/deploy/make-installer.iss
@ -3,9 +3,9 @@
 #define VERSIONFILE "..\zaaReloaded2\VERSION"
 #define PUB_YEARS "2015-2016"
-#define TARGET_HOST "excel"
+#define TARGET_HOST "word"
 #define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}"
-#define PRODUCT "zaaReloaded"
+#define ADDIN_NAME "zaaReloaded"
 #define COMPANY "Daniel Kraus (bovender)"
 #define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
 #define HOMEPAGE "http://zaa.nephrowiki.de"
--- a/www/index.html
+++ b/www/index.html
@ -368,7 +368,7 @@
    <footer class="footer">
      <p>
-        &copy; 2015 <a href="http://www.bovender.de">Daniel Kraus</a>
+        &copy; 2015-2016 <a href="http://www.bovender.de">Daniel Kraus</a>
        <span class="pull-right">
          Handarbeit mit
          <a href="http://www.vim.org">
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@ -1,4 +1,4 @@
-2.2.2
+2.2.3
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-06221d6b4b1882414daa439d5cc68a7a9b88b57c7a1b96b9184c6c8afc624eec  deploy/releases/zaaReloaded-2.2.2.exe
+077df8d43cf97ef4082cda988393734a825b51cf0e023527cdc5752502c83f03  deploy/releases/zaaReloaded-2.2.3.exe
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@ -1,2 +1,2 @@
-2.2.2
+2.2.3
-2.2.2.0
+2.2.3.0
Author	SHA1	Message	Date
Daniel Kraus	b1cd1f1a05	Merge branch 'release-2.2.3'	2016-03-30 14:11:57 +02:00
Daniel Kraus	003da0f1b2	Update copyright year on home page.	2016-03-30 14:11:49 +02:00
Daniel Kraus	9a5cc4d9df	Update version info file.	2016-03-30 14:11:03 +02:00
Daniel Kraus	15ada1cefd	Update VstoAddinInstaller and fix make-installer script.	2016-03-30 14:08:15 +02:00
Daniel Kraus	94efa435f2	Bump version number, write history.	2016-03-30 14:02:33 +02:00
Daniel Kraus	89df2f5e13	Fix host declaration in installer script. - REPARIERT: Installationsskript hat Add-in nicht aktiviert.	2016-03-30 13:59:43 +02:00
Daniel Kraus	e3e86891b8	Merge branch 'release-2.2.2' into develop	2016-03-29 21:49:54 +02:00