diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:31:54 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:31:54 -0300 |
commit | 8563d02ef05f21b537e3e1471c4034baa644a55f (patch) | |
tree | 6dee20109568b03da07cf3f6e0b61b4f73ed24e2 /extra/partitionmanager/PKGBUILD | |
parent | b5e623669f9d93fa23637bc3beca5a1751e70ff1 (diff) | |
parent | bbb460f85242e6ac03f47b74b9d0be66ff089ac4 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/libevent/PKGBUILD
core/syslinux/PKGBUILD
extra/a2ps/PKGBUILD
extra/amarok/PKGBUILD
extra/libstroke/PKGBUILD
extra/pidgin/PKGBUILD
Diffstat (limited to 'extra/partitionmanager/PKGBUILD')
0 files changed, 0 insertions, 0 deletions