summaryrefslogtreecommitdiff
path: root/kde-unstable/kdeutils-kfloppy
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-11-09 20:51:43 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-11-09 20:51:43 +0100
commit7b801d14eb78615912e7456a4654c2488bdee4d5 (patch)
tree070ebb46ae5f3eda613c61c00455800ec93267cd /kde-unstable/kdeutils-kfloppy
parent6437e5e532491d7221030a7647fde7a69d1a1099 (diff)
parentc865fc041a0945e396f139a86315f6a25b1d4dec (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/erlang/PKGBUILD community/mcabber/PKGBUILD community/smem/PKGBUILD community/uqm/PKGBUILD extra/bitlbee/PKGBUILD extra/gvfs/PKGBUILD extra/gweled/PKGBUILD extra/libmikmod/PKGBUILD extra/sdl_sound/PKGBUILD extra/xmms/PKGBUILD libre/gnu-ghostscript/PKGBUILD libre/libretools/PKGBUILD
Diffstat (limited to 'kde-unstable/kdeutils-kfloppy')
0 files changed, 0 insertions, 0 deletions