diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-10 18:30:22 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-10 18:30:22 +0100 |
| commit | 422ddbe135468a35d04170922ea3d25d18246aca (patch) | |
| tree | 39b4d1c3999a4d3a24331974af195f58ede88e29 /extra/vlc/PKGBUILD | |
| parent | 9c9dcb7ee95f321e5a4243792500f059231722cb (diff) | |
| parent | 4aef0a374e20e36cf2bf6e779d93789d9a5791ae (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chicken/PKGBUILD
community/sqliteman/PKGBUILD
extra/exo/PKGBUILD
extra/pyqt/PKGBUILD
extra/sip/PKGBUILD
extra/tumbler/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'extra/vlc/PKGBUILD')
0 files changed, 0 insertions, 0 deletions