Merge branch 'release-2.2.3'

This commit is contained in:
daniel 2016-03-30 14:11:57 +02:00
commit b1cd1f1a05
6 changed files with 16 additions and 8 deletions

View File

@ -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) Version 2.2.2 (2016-03-29)
======================================================================== ========================================================================

@ -1 +1 @@
Subproject commit aa285e0ed2175cf67e0d23201d2e10ae2457ab8e Subproject commit f96d784a3afa56abddf77fdaa2c7a8dcdfb6bacb

View File

@ -3,9 +3,9 @@
#define VERSIONFILE "..\zaaReloaded2\VERSION" #define VERSIONFILE "..\zaaReloaded2\VERSION"
#define PUB_YEARS "2015-2016" #define PUB_YEARS "2015-2016"
#define TARGET_HOST "excel" #define TARGET_HOST "word"
#define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}" #define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}"
#define PRODUCT "zaaReloaded" #define ADDIN_NAME "zaaReloaded"
#define COMPANY "Daniel Kraus (bovender)" #define COMPANY "Daniel Kraus (bovender)"
#define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert." #define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
#define HOMEPAGE "http://zaa.nephrowiki.de" #define HOMEPAGE "http://zaa.nephrowiki.de"

View File

@ -368,7 +368,7 @@
<footer class="footer"> <footer class="footer">
<p> <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"> <span class="pull-right">
Handarbeit mit Handarbeit mit
<a href="http://www.vim.org"> <a href="http://www.vim.org">

View File

@ -1,4 +1,4 @@
2.2.2 2.2.3
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
06221d6b4b1882414daa439d5cc68a7a9b88b57c7a1b96b9184c6c8afc624eec deploy/releases/zaaReloaded-2.2.2.exe 077df8d43cf97ef4082cda988393734a825b51cf0e023527cdc5752502c83f03 deploy/releases/zaaReloaded-2.2.3.exe

View File

@ -1,2 +1,2 @@
2.2.2 2.2.3
2.2.2.0 2.2.3.0