diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-12 18:26:02 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-12 18:26:02 +0100 |
| commit | 320410f103f52cbb71eb6a39d6335e24a9a79495 (patch) | |
| tree | c6590e20b2c787d45458747a8e55aac24c810a13 /community/mplayer2 | |
| parent | fd4efab9cfe55b35fdc659aa5777faa1917f2fd6 (diff) | |
| parent | 22b0fa480661b6247dabf39059fe629e1d233a9a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nsd/PKGBUILD
community/python-pymongo/PKGBUILD
core/krb5/PKGBUILD
extra/pidgin/PKGBUILD
Diffstat (limited to 'community/mplayer2')
0 files changed, 0 insertions, 0 deletions