summaryrefslogtreecommitdiff
path: root/community/mplayer2
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-06 11:35:51 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-06 11:35:51 -0300
commit6ba17fd7084afd34f49d65a2d214a0c9617b4cd4 (patch)
tree558ac00cf29df9ac6f9123b3b9e3300b2f80eab9 /community/mplayer2
parent32b74695faa265e8390b32b499b34b95f186385b (diff)
parentc81b3455112a3b09a8341fc8c45a91bd92c15a12 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/abuse/PKGBUILD community/cppunit/PKGBUILD community/icon-slicer/PKGBUILD
Diffstat (limited to 'community/mplayer2')
0 files changed, 0 insertions, 0 deletions