diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-20 11:40:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-20 11:40:04 +0100 |
| commit | fa1021504c53eb066826883dab3918e432b93444 (patch) | |
| tree | 312e7333a30cb09f648a85ec1a78bfb151ade116 /~brendan | |
| parent | 65de768385d6ee97a2b45c807ab9955c642da7c0 (diff) | |
| parent | 99136e3a2e9f6f07a7ff08d5721bce354b853c8b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/freeimage/PKGBUILD
community/gummi/PKGBUILD
community/mfs/PKGBUILD
community/nzbget/PKGBUILD
community/openntpd/PKGBUILD
community/proj/PKGBUILD
community/yaws/PKGBUILD
gnome-unstable/totem-plparser/PKGBUILD
gnome-unstable/totem/PKGBUILD
multilib/lib32-libice/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcomposite/PKGBUILD
multilib/lib32-libxdmcp/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxinerama/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-libxss/PKGBUILD
multilib/lib32-libxtst/PKGBUILD
multilib/lib32-libxxf86vm/PKGBUILD
testing/bash/PKGBUILD
testing/bash/system.bashrc
Diffstat (limited to '~brendan')
0 files changed, 0 insertions, 0 deletions