diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-28 13:23:06 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-28 13:23:06 +0100 |
| commit | b1bde86b7410654132cd3365cc82e2ab7306b5f7 (patch) | |
| tree | cdd900b7b62d0bf35c9b980ab71e0474d604bd72 /~brendan | |
| parent | 6fee6e650c46dcf94e9bd79efa2b2bf8a298d271 (diff) | |
| parent | 24d0263a0ac516ccc86df09146449fb040fb3689 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gmic/PKGBUILD
community/projectm/PKGBUILD
extra/dvdauthor/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imagemagick/PKGBUILD
extra/obex-data-server/PKGBUILD
extra/phonon/PKGBUILD
extra/psiconv/PKGBUILD
extra/pstoedit/PKGBUILD
Diffstat (limited to '~brendan')
0 files changed, 0 insertions, 0 deletions