summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-07-14 18:08:11 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-07-14 18:08:11 -0300
commitf9ffab37f4d86f65d31fd4ff56b357af59f3612a (patch)
tree9466ba8fc6d0c209c80092c9248b2a8ffd0537ad /libre-testing
parentd1c720e0d937ab956225ca4ce869066cdcec325e (diff)
parentde9ab185a1c49d54b0ab5cee79f016d663d90b10 (diff)
downloadabslibre-f9ffab37f4d86f65d31fd4ff56b357af59f3612a.tar.gz
abslibre-f9ffab37f4d86f65d31fd4ff56b357af59f3612a.tar.bz2
abslibre-f9ffab37f4d86f65d31fd4ff56b357af59f3612a.zip
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts: libre/initscripts/PKGBUILD
Diffstat (limited to 'libre-testing')
0 files changed, 0 insertions, 0 deletions