summaryrefslogtreecommitdiff
path: root/~fauno
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-08 09:16:29 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-08 09:16:29 -0300
commit91b1c319d6364307eb3bfcb0768e3eaa09df7c17 (patch)
tree91a5fcd8f433130db7dfc8060b66f98103949797 /~fauno
parent0c2419984cf5501fc1ba410e09f61fa4112c7d2a (diff)
parent9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff)
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts: libre/kdelibs-libre/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions