aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ahlborn <jtahlborn@yahoo.com>2018-12-24 01:59:08 +0000
committerJames Ahlborn <jtahlborn@yahoo.com>2018-12-24 01:59:08 +0000
commit61024b0227e3bd4455a4e55fae0e498f40fdda5a (patch)
tree3555aa583c741f0a961536ea88d9b2796a463be8
parent9c638f35bf36cca19a58c5f0a3267af63b164069 (diff)
parentcbaecd70fff730a0d6d0fb7177e95c1fd36fb761 (diff)
downloadjackcess-61024b0227e3bd4455a4e55fae0e498f40fdda5a.tar.gz
jackcess-61024b0227e3bd4455a4e55fae0e498f40fdda5a.zip
merge trunk changes through r1251
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/jdk8@1252 f203690c-595d-4dc9-a70b-905162fa7fd2
-rw-r--r--NOTICE.txt11
-rw-r--r--src/changes/changes.xml2
2 files changed, 7 insertions, 6 deletions
diff --git a/NOTICE.txt b/NOTICE.txt
index bf7ce69..208c7de 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,6 @@
-Many of the financial functions have been originally copied from the Apache
-POI project (Apache Software Foundation) and the UCanAccess Project. They
-have been then modified and adapted so that they are integrated with Jackcess,
-in a consistent manner. The Apache POI and UCanAccess projects are licensed
-under Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.
+Many of the financial functions in the expression engine have been originally
+copied from the Apache POI project (Apache Software Foundation) and the
+UCanAccess Project. They have been then modified and adapted so that they are
+integrated with Jackcess, in a consistent manner. The Apache POI and
+UCanAccess projects are both licensed under Apache License, Version 2.0
+http://www.apache.org/licenses/LICENSE-2.0.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ca9b7aa..f77b937 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -29,7 +29,7 @@
commons-lang3.
</action>
</release>
- <release version="2.2.1" date="TBD">
+ <release version="2.2.1" date="2018-12-22">
<action dev="jahlborn" type="update">
Implement the majority of the missing standard functions:
FormatCurrency, FormatDateTime, FormatNumber, FormatPercent, Val,