diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-14 10:56:20 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-14 10:56:20 -0300 |
| commit | d5be0922f99093b4659507a4c17c664ac5c2f577 (patch) | |
| tree | 03704fe8477fe4f6e3f2f15f0bd848b5e4b702e9 /extra/dnsmasq/PKGBUILD | |
| parent | c6d876200ad3def9a1e9725b3daf29e01ae8e3c5 (diff) | |
| parent | a36c4a33891932acf2ac1cdebbb9caed01d7df6f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/pdf2djvu/PKGBUILD
core/systemd/PKGBUILD
extra/audacious/PKGBUILD
extra/cups/PKGBUILD
multilib-testing/lib32-libdrm/PKGBUILD
staging/inkscape/PKGBUILD
staging/poppler/PKGBUILD
testing/ethtool/PKGBUILD
testing/libdrm/PKGBUILD
testing/openconnect/PKGBUILD
Diffstat (limited to 'extra/dnsmasq/PKGBUILD')
0 files changed, 0 insertions, 0 deletions