diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-06 11:13:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-06 11:13:51 +0200 |
| commit | a86ff663185661ee304bb1f6d00d982102dd706d (patch) | |
| tree | 06520d9024b40745b94f02d0d3419386e6496863 /core/ldns | |
| parent | ce32dcab8e4baa2afe51fd3b7a858a840372b0a5 (diff) | |
| parent | ffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apitrace/PKGBUILD
community/mksh/PKGBUILD
community/net6/PKGBUILD
community/xapian-core/PKGBUILD
extra/garcon/PKGBUILD
extra/mesa/PKGBUILD
extra/scim/PKGBUILD
extra/virtuoso/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-panel/PKGBUILD
extra/xfwm4/PKGBUILD
Diffstat (limited to 'core/ldns')
0 files changed, 0 insertions, 0 deletions