diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-20 10:35:46 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-20 10:35:46 +0200 |
| commit | 964dfed2669c05373815ba135efc563e313cf792 (patch) | |
| tree | f4ccee9d34e51f3a53d7334f4fcec5bf2055a9f2 /social/tokyotyrant | |
| parent | 4f22a5c482279b73ed0140e8962f75169f9b3e57 (diff) | |
| parent | 383955a81810f344e11b1472bd4c5069fa77020c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/kvpnc/PKGBUILD
extra/bmp/PKGBUILD
extra/parted/PKGBUILD
extra/python-m2crypto/PKGBUILD
extra/vamp-plugin-sdk/PKGBUILD
extra/xsane/PKGBUILD
libre/syslinux/PKGBUILD
Diffstat (limited to 'social/tokyotyrant')
0 files changed, 0 insertions, 0 deletions