summaryrefslogtreecommitdiff
path: root/~lukeshu
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-05-05 16:43:59 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-05-05 16:43:59 +0200
commiteea781ff51db0dcc8e7263625d9b206d8b498b14 (patch)
tree1c36f59ff34ac845dad77ddb50cde427c5dc1bd4 /~lukeshu
parent64552a84f9eb436e191d738ef4ebc552a768048d (diff)
parent7a600dcabb6923ee79d36a4eaab2fc6867bdb807 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: core/dbus/PKGBUILD extra/opus/PKGBUILD extra/ypbind-mt/PKGBUILD
Diffstat (limited to '~lukeshu')
0 files changed, 0 insertions, 0 deletions