diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
| commit | c94bf77ede06fa67fd3222ffa3fcad8898e1fd59 (patch) | |
| tree | 3e4cc7f273a07c12fd69c589da434717e523664f /community/pyvorbis/PKGBUILD | |
| parent | 0f89996e6f908cc405cd44478860b864dcb189f1 (diff) | |
| parent | 3b99c42eb8ca744e86e4e17197b1bf10642c6785 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/nginx/PKGBUILD
community-testing/nginx/nginx.install
community/chrony/PKGBUILD
community/lxdm/PKGBUILD
community/oidentd/PKGBUILD
community/oss/PKGBUILD
community/pdnsd/PKGBUILD
community/ruby-cairo/PKGBUILD
community/subtle/PKGBUILD
core/kmod/PKGBUILD
core/lvm2/PKGBUILD
core/openldap/PKGBUILD
core/systemd/PKGBUILD
extra/smartmontools/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community/pyvorbis/PKGBUILD')
0 files changed, 0 insertions, 0 deletions