diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-04 10:40:59 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-04 10:40:59 -0300 |
commit | 1d3002e46bb10b50ac35a99b6d2e672cb2c4b2f9 (patch) | |
tree | 216bc7e920c66a705a160ab98ca99ebd3f692e8e /core/dmraid/dmraid_tmpfiles | |
parent | e5ec91bd8051afc41414938217ee09c65aa6c7a2 (diff) | |
parent | 8bec6ab49870cd93d3fc53aca96b261cbec8065f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/hostapd/PKGBUILD
community/polipo/PKGBUILD
extra/libotf/PKGBUILD
extra/libssh/PKGBUILD
extra/m17n-lib/PKGBUILD
Diffstat (limited to 'core/dmraid/dmraid_tmpfiles')
0 files changed, 0 insertions, 0 deletions