diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-12 17:27:25 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-12 17:27:25 +0200 |
| commit | e6a52ebf66f2b60ad1afb478bfe358514043b676 (patch) | |
| tree | 7b7bd6feb01ddf1f0340523bd02903b57b76885e /extra/live-media | |
| parent | 678a7a4fb762d6669c9c2105b78d107aeebe163e (diff) | |
| parent | 21c375ba65c4730e25cd0b135aff7811bf28c77a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/haskell-html/PKGBUILD
community-staging/haskell-regex-base/PKGBUILD
community-staging/haskell-stm/PKGBUILD
community-staging/haskell-terminfo/PKGBUILD
extra/avahi/PKGBUILD
extra/elfutils/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/live-media')
0 files changed, 0 insertions, 0 deletions