diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-08 10:04:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-08 10:04:45 +0100 |
| commit | c4e52ac02d1d223901ab48f78d9835fda60acd0c (patch) | |
| tree | 0d9401c37c51deb92a3b16c0eeaeb45404334f1b /extra/vlc/PKGBUILD | |
| parent | 0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (diff) | |
| parent | 129db5c42a9c8f32d88c57ac3b81182acf844068 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
community/ruby-cairo/PKGBUILD
community/smem/PKGBUILD
extra/pyqt/PKGBUILD
extra/xerces-c/PKGBUILD
Diffstat (limited to 'extra/vlc/PKGBUILD')
0 files changed, 0 insertions, 0 deletions