diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-02 21:45:22 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-02 21:45:22 -0300 |
| commit | 1f31420f313381bbb03fdc934348f5606134191c (patch) | |
| tree | 217f5f6da0acef84ca46e3308eff01a57ae6baaa /extra/imlib2 | |
| parent | 0ca20230bdd33f8e07d2da28bec74c5e685650e9 (diff) | |
| parent | 20bf19bd85f0a70a575491c17aa7354c1a8fd97d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib-testing/gcc-multilib/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
staging/mpd/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'extra/imlib2')
0 files changed, 0 insertions, 0 deletions