summaryrefslogtreecommitdiff
path: root/extra/opencore-amr
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-12 10:18:52 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-12 10:18:52 +0200
commita4a706ff05afab9bb61870c0049aedb23072cec1 (patch)
treec2200f0a6e7d6eb40e46a91443ef61b7774b5d9e /extra/opencore-amr
parent5d57336390ba107efd75b271608fde2fa6172193 (diff)
parentd976aa5e1544c80dc2457ea20b27f28f3fa05899 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/mcelog/PKGBUILD extra/calligra/PKGBUILD extra/libmpdclient/PKGBUILD extra/mpc/PKGBUILD extra/opencv/PKGBUILD extra/qt5/PKGBUILD
Diffstat (limited to 'extra/opencore-amr')
0 files changed, 0 insertions, 0 deletions