diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-03 19:35:59 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-03 19:35:59 +0100 |
| commit | 8288f4022c5673fa36117598c7e7a3f6c2dfb1e2 (patch) | |
| tree | 35b688c3ea6cc6a70169239cbc4cce363280f27b /extra/mercurial | |
| parent | 3d7ac901b631943e595c15f8405b6d66770573e9 (diff) | |
| parent | d8fb549de0ef3299436c448f7b45fd8ebee8e733 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community/duplicity/PKGBUILD
extra/bind/PKGBUILD
libre/linux-libre/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
multilib-testing/lib32-glibc/glibc-2.15-ifunc.patch
multilib-testing/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
multilib-testing/lib32-glibc/glibc-2.15-scanf.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-sdl/PKGBUILD
testing/lirc/PKGBUILD
Diffstat (limited to 'extra/mercurial')
0 files changed, 0 insertions, 0 deletions