diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-19 10:03:21 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-19 10:03:21 +0100 |
| commit | 46602cb86218c37b896a2c90aa702d94793b6779 (patch) | |
| tree | 107fedff7db7ea57c5bd9684f98805b2f1167029 /extra/upower/PKGBUILD | |
| parent | 7e6a790c47fb44426cdda8ea0aca8c247a524c5e (diff) | |
| parent | de5b6982e42f4a1e8b0537cfbc1b676e2a81f195 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/quesoglc/PKGBUILD
community/trickle/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/perl-dbi/PKGBUILD
extra/perl-net-dns/PKGBUILD
extra/xfce4-dev-tools/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
multilib-testing/lib32-libdrm/PKGBUILD
multilib-testing/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
Diffstat (limited to 'extra/upower/PKGBUILD')
0 files changed, 0 insertions, 0 deletions