diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-07 12:36:05 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-07 12:36:05 +0100 |
commit | a56d1a610bd4032e2eae610289333ad112fc5ba1 (patch) | |
tree | 5fa9f42a339b57ef35616c01ac67c1c55c84fc7b /extra/kdeutils-kgpg/PKGBUILD | |
parent | 9437cdbc03cb103235fa0b043f4cf73882f10f34 (diff) | |
parent | 8e5a0a990a12a59cadb687cae22a1960fce1660b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/midori/PKGBUILD
community/ruby-gtk2/PKGBUILD
extra/strigi/PKGBUILD
libre/abiword-libre/PKGBUILD
libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
Diffstat (limited to 'extra/kdeutils-kgpg/PKGBUILD')
0 files changed, 0 insertions, 0 deletions