diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
| commit | 96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch) | |
| tree | f107c3838373376ef130dcfcb5a980cf8ad30a5f /extra/libmad | |
| parent | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff) | |
| parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/gpsmanshp/PKGBUILD
community/pigz/PKGBUILD
extra/calligra/PKGBUILD
extra/genius/PKGBUILD
extra/gnumeric/PKGBUILD
extra/goffice/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/libgphoto2/PKGBUILD
extra/python-numpy/PKGBUILD
Diffstat (limited to 'extra/libmad')
0 files changed, 0 insertions, 0 deletions