diff options
| author |   Ian Delaney <della5@iinet.com.au> | 2012-04-16 01:10:46 +0800 |
|---|---|---|
| committer | Ian Delaney <della5@iinet.com.au> | 2012-04-16 01:10:46 +0800 |
| commit | 3354c0e6d5dd22bc11b390edf3ffe64805852872 (patch) | |
| tree | 23df5edfcc7f79f8df1bb4231bdc14bf4819879d /sets | |
| parent | Corrections; authres-0.3, django-xslt-0.4.5, tampakrap-requested-packages (diff) | |
| parent | update set (diff) | |
| download | improvise-3354c0e6d5dd22bc11b390edf3ffe64805852872.tar.gz improvise-3354c0e6d5dd22bc11b390edf3ffe64805852872.tar.bz2 improvise-3354c0e6d5dd22bc11b390edf3ffe64805852872.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/user/improvise
Conflicts:
sets/tampakrap-requested-packages
Diffstat (limited to 'sets')
| -rw-r--r-- | sets/tampakrap-requested-packages | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sets/tampakrap-requested-packages b/sets/tampakrap-requested-packages index 910da17..2a4ebc7 100644 --- a/sets/tampakrap-requested-packages +++ b/sets/tampakrap-requested-packages @@ -31,9 +31,11 @@ dev-python/django-compressor #dep of diogenis dev-python/feedjack #dev-python/pkginfo #dep of errorhandler #dev-python/testfixtures #dep of xlutils -dev-python/xlutils +dev-python/xlutils #dep of diogenis #dev-python/manuel #dep of testfixtures #dev-python/pkginfo #dep of errorhandler +dev-python/django-xslt +#dev-python/feedparser #dep of feedjack #net-zope/zope-component #dep of testfixtures; test phase # KDE |