summaryrefslogtreecommitdiff
path: root/extra/k3b
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-08-22 11:02:40 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-08-22 11:02:40 +0200
commit55a7d75889507a9882c91f8c0a44ea9460a5d095 (patch)
treee4d40e8bdb76614317edbd6d07f1d226eb80bb39 /extra/k3b
parentf23b8ed12499118d66340154fe8369623da3da34 (diff)
parent297a042ac9a7bbd2b18a9551f5fa4fe43faf53b2 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: core/rfkill/PKGBUILD extra/libkgapi/PKGBUILD extra/transmission/PKGBUILD testing/grep/PKGBUILD testing/grep/grep.install
Diffstat (limited to 'extra/k3b')
0 files changed, 0 insertions, 0 deletions