diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
| commit | 830afd54d0d990fdb982292bed4c97f577dc195d (patch) | |
| tree | 5c081214c4d28eae5e46c33094131ecc555b4a8f /testing | |
| parent | 06dc337f60287526f4db95ce79a2ea506023bffa (diff) | |
| parent | 5ea071a53492ec9512f8d08a8b8ff8e08499209d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/libgexiv2/PKGBUILD
community/monica/PKGBUILD
community/neatx/PKGBUILD
community/qstardict/PKGBUILD
community/shell-fm/PKGBUILD
core/isl/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/kdetoys/PKGBUILD
extra/pkgfile/PKGBUILD
extra/pyqt4/PKGBUILD
extra/sip/PKGBUILD
extra/sqlite/PKGBUILD
Diffstat (limited to 'testing')
0 files changed, 0 insertions, 0 deletions