summaryrefslogtreecommitdiff
path: root/community/xkeycaps/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-11-23 17:44:22 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2011-11-23 17:44:22 +0100
commit2834c39eaa8a97fa6d3a2355f46b21da3a4bb8de (patch)
treec7e5032604c3c6a2ba63599389c26873cbf3c65c /community/xkeycaps/PKGBUILD
parent5f0ea75dbd480a1ced023070da9847e1c6959692 (diff)
parent851ab9aa99e9bda38f88b5f5ade096c9137e11c8 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/acetoneiso2/PKGBUILD community/gpsman/PKGBUILD community/gts/PKGBUILD community/lat/PKGBUILD community/pidgin-fonomobutton/PKGBUILD community/qemu-launcher/PKGBUILD core/isdn4k-utils/PKGBUILD extra/nouveau-drm-lts/PKGBUILD
Diffstat (limited to 'community/xkeycaps/PKGBUILD')
0 files changed, 0 insertions, 0 deletions