diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
commit | 01346da4de50d9eda2660653fcaae6c1abfaa28a (patch) | |
tree | bd7bb7e3f004777c788f809c5a5a10a69839be13 /core/mkinitcpio-busybox | |
parent | 5bc312c4c7af74bbbb6042c5856bac6e53efa32c (diff) | |
parent | 1b9f6dc846379470b620b5dbb9d4d7acd1de148c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-chewing/PKGBUILD
community/fcitx-cloudpinyin/PKGBUILD
community/fcitx-rime/PKGBUILD
community/linux-tools/PKGBUILD
community/lxpanel/PKGBUILD
community/pdns/PKGBUILD
core/bash/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/json-c/PKGBUILD
extra/liblouis/PKGBUILD
extra/live-media/PKGBUILD
extra/samba/PKGBUILD
extra/transmission/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'core/mkinitcpio-busybox')
0 files changed, 0 insertions, 0 deletions