diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
| commit | 66873986693bc3c8812d12f3919f1977b9a30674 (patch) | |
| tree | 14a385b80dfa23890d9d864dd89fafb61dd38ff2 /community/haskell-tar | |
| parent | fa448c3d0b12a414235560d2cbd14eb74aace7bd (diff) | |
| parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/puzzles/PKGBUILD
core/lvm2/PKGBUILD
core/mdadm/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'community/haskell-tar')
0 files changed, 0 insertions, 0 deletions