summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorFlorian Franzmann2015-06-28 22:03:57 +0200
committerFlorian Franzmann2015-07-02 19:36:29 +0200
commitea9de651e5f41fb71b102aea2973932c2d309244 (patch)
tree1c5657294644c6ca44277151f086f79b555f25e0 /ChangeLog
parentadeae93976afb4fbb164ed51341c9e065a1ea907 (diff)
devel/patchelf: new spell, a tool for modifying elf executables
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cc700ecc4..dc0926845f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -11,6 +12,9 @@
* haskell/haskell-nanospec: new spell, A lightweight implementation
of a subset of Hspec's API
+2015-06-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * devel/patchelf: new spell, a tool for modifying elf executables
+
2015-06-27 Ismael Luceno <ismael@sourcemage.org>
* haskell/haskell-blaze-markup: new spell, A blazingly fast markup
combinator library for Haskell