diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-05 11:01:59 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-05 11:01:59 +0200 |
| commit | 2404cab74d2adee25da90382310e16f36b9da81e (patch) | |
| tree | 6b6958b291e7f2bd58b01fc63809203f8c9c423b /artistic | |
| parent | b796bed39624486a348d1cb2881c5a1e88f84954 (diff) | |
| parent | 9b4356a4ce894946739f7fff9411f62be0fbc122 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcurve-kde4/PKGBUILD
community-testing/r8168-lts/PKGBUILD
multilib/lib32-libphobos/PKGBUILD
testing/bison/PKGBUILD
testing/flex/PKGBUILD
testing/logrotate/PKGBUILD
Diffstat (limited to 'artistic')
0 files changed, 0 insertions, 0 deletions