summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorFlorian Franzmann2015-06-28 22:04:28 +0200
committerFlorian Franzmann2015-07-02 19:37:00 +0200
commit6e21c34c48071b53ddaf153ff67aac1d09355bfc (patch)
tree505dd80d6253e1a17baafe40ea2c24e599356798 /ChangeLog
parentea9de651e5f41fb71b102aea2973932c2d309244 (diff)
move entry to its chronological place
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dc0926845f..a0d174a283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
2015-07-02 Vlad Glagolev <stealth@sourcemage.org>
* accounts, groups: added account data for opensmtpd spell
* libs/libasr: new spell, free, simple and portable asynchronous resolver
@@ -77,6 +76,10 @@
* haskell/haskell-entropy: new spell, cryptographically strong
entropy
+2015-06-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * devel/gnat_util: new spell, a library uniting a number of GNAT
+ sources that are used by different tools
+
2015-06-18 Treeve Jelbert <treeve@sourcemage.org>
* database/ejdb: embeddable (in-process) database engine