summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-12-13 11:21:38 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-12-13 11:21:38 -0300
commitd51e9b973c5e554869e188fdc65106728c95c0c7 (patch)
tree7880a41f091fffab06471d492921400234023b4f /core
parent7a54f5ebad2b78abe9e2c89cf0e4c2ebfeeea0ec (diff)
parent1517345ab70f42a5e050f3dc9b498038118f9ff1 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/luaexpat/PKGBUILD community/udevil/PKGBUILD extra/help2man/PKGBUILD
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions