diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-07 18:10:48 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-07 18:10:48 +0100 |
| commit | 61733e7ff1a756e9325154d9d52cdcdeb27d9097 (patch) | |
| tree | a0f842807088c4986fb918be0de70bac3f18ea04 /extra/xf86-video-ast | |
| parent | 42badd081241c57a3b9bbd7a18dec85e64038314 (diff) | |
| parent | 5a680f7689b01b4b7a0bfade1a6c1f659f8cbed4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bin2iso/PKGBUILD
community/espeak/PKGBUILD
community/gnash/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haskell-binary/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/kmess/PKGBUILD
community/libident/PKGBUILD
community/lwm/PKGBUILD
core/dialog/PKGBUILD
core/gcc/PKGBUILD
core/libtool/PKGBUILD
core/ppl/PKGBUILD
extra/boost/PKGBUILD
extra/dnsmasq/PKGBUILD
extra/ghc/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/pekwm/PKGBUILD
extra/soprano/PKGBUILD
extra/udisks/PKGBUILD
multilib-testing/lib32-libpciaccess/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
multilib/lib32-glibc/glibc-2.15-ifunc.patch
multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
multilib/lib32-glibc/glibc-2.15-scanf.patch
multilib/libtool-multilib/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/libpciaccess/PKGBUILD
testing/mkinitcpio-busybox/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/xf86-video-ast')
0 files changed, 0 insertions, 0 deletions