aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bock <nicolasbock@gmail.com>2013-09-27 11:34:06 -0600
committerNicolas Bock <nicolasbock@gmail.com>2013-09-27 11:34:06 -0600
commita5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708 (patch)
tree770dbf69d7ca5c8b2d12e38d44681e7ac0065107
parentsys-clyster/charm-6.5.1-r1: Fix missing DEPEND. (diff)
parentfix broken patch (diff)
downloadsci-a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708.tar.gz
sci-a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708.tar.bz2
sci-a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708.zip
Merge branch 'master' of github.com:gentoo-science/sci
Conflicts: sys-cluster/charm/ChangeLog
-rw-r--r--sys-cluster/charm/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index ace12f172..492cc962c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -10,6 +10,10 @@
sys-clyster/charm-6.5.1-r1: Fix missing DEPEND. This addresses bug 486202.
The ebuild had a missing DEPEND using the doc USE flag.
+ 27 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
+ files/charm-6.5.1-fix-string-parsing.patch:
+ fix broken patch
+
14 Sep 2013; Nicolas Bock <nicolasbock@gmail.com>
files/charm-6.5.1-fix-string-parsing.patch:
sys-cluster/charm-6.5.1: Small fix in patch to make printing less verbose.