diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-24 10:30:46 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-24 10:30:46 -0300 |
commit | 328b5407de9f088d32c429b1b37f6efde3da06f8 (patch) | |
tree | 99b9a1286dd5d2b2a4f8a9ab4d4976b2a92cdf04 /community/osdlyrics | |
parent | bc45ad1bcb68d9ab4af8a7419beb52606ff4c7b2 (diff) | |
parent | 570e3637e2a4ba372dabbbbb8953d7b4ccdcaa39 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dee/PKGBUILD
community/kadu/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/mesa/PKGBUILD
extra/php/PKGBUILD
extra/qt/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/xorg-xsetroot/PKGBUILD
Diffstat (limited to 'community/osdlyrics')
0 files changed, 0 insertions, 0 deletions