summaryrefslogtreecommitdiff
path: root/libre/mplayer-libre
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-10-04 16:46:51 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-10-04 16:46:51 -0300
commit9823361973d7087bca6e7acaf3064168b8571c10 (patch)
tree082291c046f51d633f26bde9d0a734e40a7c3cc8 /libre/mplayer-libre
parent2e39dc019e1eb8077c86a6866f562bff9f4f4035 (diff)
parent05222ffb2ec1987563da1b6c869fe374b20a2ee8 (diff)
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts: libre/icecat/PKGBUILD
Diffstat (limited to 'libre/mplayer-libre')
0 files changed, 0 insertions, 0 deletions