summaryrefslogtreecommitdiff
path: root/extra/brasero
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-04-09 09:50:29 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-04-09 09:50:29 +0200
commit4d0f0293b0108f751d79e5a060534fbc9575f7bb (patch)
tree93c28176dfd2491e899d2ffb967c671abddc8ab8 /extra/brasero
parent2cf785af142618fb225778622b1d94a016c18462 (diff)
parent1fed401c439c264bd92a4c13af1bea0bea458cb4 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: core/gawk/PKGBUILD libre/linux-libre/PKGBUILD staging/icu/PKGBUILD testing/cairo/PKGBUILD
Diffstat (limited to 'extra/brasero')
0 files changed, 0 insertions, 0 deletions