diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-15 10:59:36 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-15 10:59:36 +0100 |
commit | 7545c059f8a1aadcf7dc1a15adb739ddbd8c61cc (patch) | |
tree | ec53c4230cddd1602f9893574dd8a16c7c2d6747 /core/bzip2 | |
parent | a81a0b6ad84173e4494421a1dfafa77415f479df (diff) | |
parent | 3cc17982fa285effbc27ce867815e56bae56238d (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gmp/PKGBUILD
extra/pidgin/PKGBUILD
extra/qtwebkit/PKGBUILD
Diffstat (limited to 'core/bzip2')
0 files changed, 0 insertions, 0 deletions