diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-24 10:38:51 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-24 10:38:51 -0500 |
| commit | 525f7394f309fe74d74764b604fa886e88d3c102 (patch) | |
| tree | 146ee8a84acbe0011c247b0278bf286af37d61b9 /libre/filesystem/resolv.conf | |
| parent | 89a9382e3851a12a973da2d255ebfbf654b6125e (diff) | |
| parent | 7347bb994a41d021c83e97b503f577f2399302e7 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community-testing/collectd/PKGBUILD
community/ascii/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/gtk2/PKGBUILD
extra/libmodplug/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/rox/PKGBUILD
extra/totem/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/zsnes/PKGBUILD
testing/imagemagick/PKGBUILD
testing/perl-compress-bzip2/PKGBUILD
Diffstat (limited to 'libre/filesystem/resolv.conf')
0 files changed, 0 insertions, 0 deletions