summaryrefslogtreecommitdiff
path: root/extra/empathy
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-11-13 15:20:32 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-11-13 15:20:32 +0100
commitc0a02f08d66969b92325d421354f4def5c23f84c (patch)
tree1f97a2b8ea84967f808112b173ab1e7a494b0a26 /extra/empathy
parentd830c3b1d23d90c928c68bf821049db3abf897b8 (diff)
parenta29329c38e50afd28d28c3a99e35d8774b9b19f8 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/gvfs/PKGBUILD libre/libretools/libretools.install
Diffstat (limited to 'extra/empathy')
0 files changed, 0 insertions, 0 deletions