diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-01 16:12:04 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-01 16:12:04 -0300 |
| commit | ca8ab20a665411e312578954c85f1bd3913fc726 (patch) | |
| tree | 98db13a83d797b74078d5b957f057a59cc91992b /extra/vlc/PKGBUILD | |
| parent | aee193a88b17ec5a5fa2b028f42dbe4161e3390d (diff) | |
| parent | 55f2d1ab0ab1bd2f7c8c7c5cefeb45f7c457a5d9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/hyphen/PKGBUILD
extra/imagemagick/PKGBUILD
extra/lynx/PKGBUILD
extra/pyqt/PKGBUILD
extra/sip/PKGBUILD
libre/kdelibs-libre/PKGBUILD
testing/libdrm/PKGBUILD
testing/xf86-video-ati/PKGBUILD
Diffstat (limited to 'extra/vlc/PKGBUILD')
0 files changed, 0 insertions, 0 deletions