diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-01 13:17:01 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-01 13:17:01 +0100 |
commit | 8eb3cab026abbf002dc4f803a10a06a39127fe10 (patch) | |
tree | b8624043303fdb46a88d5c93655066930505ef59 /community/matchbox-keyboard/PKGBUILD | |
parent | 36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (diff) | |
parent | 83a318800db22408628e60c9e1730578efcfee37 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/webfs/PKGBUILD
extra/gconf-editor/PKGBUILD
extra/gnutls/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/transmission/PKGBUILD
Diffstat (limited to 'community/matchbox-keyboard/PKGBUILD')
0 files changed, 0 insertions, 0 deletions