summaryrefslogtreecommitdiff
path: root/~lukeshu/pacman-lukeshu
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-23 18:50:52 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-23 18:50:52 +0100
commitc827b7e42ac7fb33713211b2fd7e0e5648fa1202 (patch)
treedf393c5f417ee38fbf8766fc9a72d2187b9e74db /~lukeshu/pacman-lukeshu
parent974aa5156f1b16ee7a9369badf73021b2e1e5aa5 (diff)
parentd4cde61aa9a5ccdde242a2bfe9eb7973a49acb49 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/fcitx/PKGBUILD extra/graphite/PKGBUILD extra/subversion/PKGBUILD
Diffstat (limited to '~lukeshu/pacman-lukeshu')
0 files changed, 0 insertions, 0 deletions