diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-05 10:41:44 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-05 10:41:44 -0300 |
| commit | 957557945e9be0a00d5153afc17f69ffe751426f (patch) | |
| tree | 4d321dff70c4fdd1ee3fa5d64db0fdd0dc1dd2e8 /~lukeshu | |
| parent | cbba2111ae585b17594535ec01f13bac66937331 (diff) | |
| parent | 67db4cf68dbdb364c4dee1599294d7701f3c3b0a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/exim/PKGBUILD
community/nsd/PKGBUILD
extra/phonon-vlc/PKGBUILD
Diffstat (limited to '~lukeshu')
0 files changed, 0 insertions, 0 deletions