diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
commit | 308f6ff034c928c0c4fc2ce168df7192ca2b1209 (patch) | |
tree | 49603bf604b0d3b3e4e0f1d71d0a52380933aa36 /libre/pacman/pacman.conf.i686 | |
parent | 99d72f453ab00a43e11f6903bf34d6cd27962a4f (diff) | |
parent | 964755f48fefde84fce71781d0744e2158f60814 (diff) | |
download | abslibre-308f6ff034c928c0c4fc2ce168df7192ca2b1209.tar.gz abslibre-308f6ff034c928c0c4fc2ce168df7192ca2b1209.tar.bz2 abslibre-308f6ff034c928c0c4fc2ce168df7192ca2b1209.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to 'libre/pacman/pacman.conf.i686')
0 files changed, 0 insertions, 0 deletions