summaryrefslogtreecommitdiff
path: root/libre/gstreamer0.10-bad-libre
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-31 10:04:24 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-31 10:04:24 +0200
commit1edeca012d353f2fb5f900e106f97dbdb73418be (patch)
tree45f9df4d9f54bf2d64c440d055cedda0b0f272e8 /libre/gstreamer0.10-bad-libre
parent28e3d220b711ea14c6adfd86958384c28a0a5d3e (diff)
parentbccd6b361bd252b2d32bc9a793c9e1b8448bfcd9 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/credentials-preferences/PKGBUILD extra/sqlite/PKGBUILD
Diffstat (limited to 'libre/gstreamer0.10-bad-libre')
0 files changed, 0 insertions, 0 deletions