diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
| commit | 8a79dffbc1b5f55765698c420217bb06f67bb684 (patch) | |
| tree | 8f8b0ee50fcd68c6572d7e7f8ce26150ac1dd430 /core/mkinitcpio-busybox | |
| parent | 35d3377392b5d0678453096f87df70faf87f72c6 (diff) | |
| parent | 5457eacc747fc3f91e10a1f452230b1feac39eff (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5-transitional/PKGBUILD
community/camlp5/PKGBUILD
community/compizconfig-backend-kconfig/PKGBUILD
community/libtrash/PKGBUILD
community/mediastreamer/PKGBUILD
community/python-pycurl/PKGBUILD
extra/alpine/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/aufs2-util/PKGBUILD
extra/bitlbee/PKGBUILD
extra/cups/PKGBUILD
extra/dotconf/PKGBUILD
extra/fbida/PKGBUILD
extra/fvwm-devel/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libindi/PKGBUILD
extra/mousepad/PKGBUILD
extra/pysmbc/PKGBUILD
extra/rcs/PKGBUILD
extra/xfprint/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/cindexer-clang-path.patch
multilib/lib32-llvm/clang-plugin-loader-registry.patch
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
Diffstat (limited to 'core/mkinitcpio-busybox')
0 files changed, 0 insertions, 0 deletions