diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
| commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
| tree | aa810cc98c17cf30cad06226c22f8256c056430e /extra/libgnome-media-profiles | |
| parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
| parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
Diffstat (limited to 'extra/libgnome-media-profiles')
0 files changed, 0 insertions, 0 deletions