diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-04 15:31:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-04 15:31:41 -0300 |
| commit | 4e3e2f9e625584fee1cdb96fcec3a49f0cacdc8b (patch) | |
| tree | 671e3e120a47e02d837e20d9759de78b9a7b4f07 /extra/dhcp/dhcp6 | |
| parent | 1f31420f313381bbb03fdc934348f5606134191c (diff) | |
| parent | 298f654d4656dcc1e8d78c37dd77ae2ebfc1bf5f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/freevo/PKGBUILD
core/openldap/PKGBUILD
extra/xf86-video-fbdev/PKGBUILD
staging/glibc/PKGBUILD
staging/glibc/glibc-2.15-revert-c5a0802a.patch
Diffstat (limited to 'extra/dhcp/dhcp6')
0 files changed, 0 insertions, 0 deletions