summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorTreeve Jelbert2015-06-13 08:57:12 +0200
committerTreeve Jelbert2015-06-13 08:57:12 +0200
commitcd414a2cac8c4903411d799f4a1e902835597241 (patch)
treecc40ea50cc702793d56ea0847a58a876378dc6e6 /ChangeLog
parent32572b2dabe0eb174c5a03da6d04c53e961c14cd (diff)
parent7bfb08232271edaededa1d05f14ab63333229070 (diff)
Merge remote-tracking branch 'origin/master' into devel-merge-kde4+plasma5+kde5
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c265e3a3f3..d598d8b58d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
* groups: Added docker:205 group for dockerio.
* utils/dockerio: Added Docker container package
+2015-05-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * devel/rebar: new spell, a build system for Erlang
+
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* KDE5_DEPENDS, QT5_DEPENDS: directly depend -sub CXX gcc
(to make up_triggers from ABI updates work)