diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-28 11:13:32 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-28 11:13:32 +0200 |
| commit | 0cc6a0720f9505aaacfc247fa646d3e888f8e4aa (patch) | |
| tree | 65312a00db8134471b6b4d8f32c36cf479effdbe /community/vym | |
| parent | 0c5c6934b681707ec1a459da4318aabd7f9b796f (diff) | |
| parent | 559da5e6e5aff9ccc57e29b6a91c35a528424b6c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/widelands/PKGBUILD
community/bird/PKGBUILD
community/hwinfo/PKGBUILD
community/pdnsd/PKGBUILD
community/spectrwm/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/wireless_tools/PKGBUILD
extra/proftpd/PKGBUILD
libre/grub/PKGBUILD
multilib-testing/lib32-libdrm/PKGBUILD
multilib-testing/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-gdk-pixbuf2/PKGBUILD
testing/pkg-config/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'community/vym')
0 files changed, 0 insertions, 0 deletions