summaryrefslogtreecommitdiff
path: root/community/libfm
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-11-15 11:17:39 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-11-15 11:17:39 +0100
commit909d51774dfc3c94aeaaeb799daaa546c566a492 (patch)
tree9d19f46f986fe91b8598b617a8dc0a66bf349e7f /community/libfm
parentdc7c61e8e22503f4f45bc2f57dc0542a8bc1ea30 (diff)
parent2264379d37a6a00a3ecec1fd03c5dd4796078d49 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/esdl/PKGBUILD community/gpg-crypter/PKGBUILD extra/claws-mail-extra-plugins/PKGBUILD extra/maxima/PKGBUILD social/tokyocabinet/PKGBUILD
Diffstat (limited to 'community/libfm')
0 files changed, 0 insertions, 0 deletions