summaryrefslogtreecommitdiff
path: root/~fauno/minidjvu
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-04 12:05:33 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-04 12:05:33 -0300
commit572db5155dc23eb1c4f65736b9ca5507eed6fbd2 (patch)
tree687a7c5627b76004103420d1575528fbfc0ff4b7 /~fauno/minidjvu
parentca2e05bb7791418f2af678704160d56d8184a21a (diff)
parentd1d68784dc66793601c239fa64cc0e02ebd9444e (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: kde-unstable/kdemultimedia/PKGBUILD libre/mplayer-libre/PKGBUILD social/diaspora-git/PKGBUILD staging/php/PKGBUILD staging/redland/PKGBUILD
Diffstat (limited to '~fauno/minidjvu')
0 files changed, 0 insertions, 0 deletions