summaryrefslogtreecommitdiff
path: root/librediff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-06-27 21:02:28 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-06-27 21:02:28 -0300
commit8dff8b1deac0bd4a832e1dee0173e79c55ab4301 (patch)
treebce94c911af93e9a857be4c2c68db845b694a1bb /librediff
parent1a60b54ff583a39e1069dcd527c347f23bbc2b5a (diff)
parentf303abe1eb26dd9037824889dc3c02df74ed9fc2 (diff)
Merge branch 'master' of ssh://vparabola/srv/git/projects/libretools
Conflicts: libremakepkg
Diffstat (limited to 'librediff')
0 files changed, 0 insertions, 0 deletions