diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-16 23:52:49 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-16 23:52:49 -0300 |
| commit | 3138d10936c63dc6444ac0dc55dd08b722b82309 (patch) | |
| tree | 93a87cbad15b2c45faa22f5242b63a2666a02431 /core/zlib | |
| parent | 17012da70df1ee83bf7a4976c0157e65638a7a9f (diff) | |
| parent | 76774d40da5ce246c9f2178fdf937706d99af4b2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blobby2/PKGBUILD
core/glibc/PKGBUILD
extra/inkscape/PKGBUILD
extra/kdenetwork/PKGBUILD
testing/kmod/PKGBUILD
Diffstat (limited to 'core/zlib')
0 files changed, 0 insertions, 0 deletions