summaryrefslogtreecommitdiff
path: root/libre/cups-libre
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-04-12 13:53:12 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-04-12 13:53:12 -0300
commita0a5078595f0fc0826387582bb0e76cb52908518 (patch)
tree8d8155b80f925068f69ee4aea606a9f24d890aeb /libre/cups-libre
parenta19cbf2e94f0c06adafec2a9ff0d1d619881cc83 (diff)
parent96df1bacd54ae9d919c62f4348cc011c961f923e (diff)
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts: libre/file-roller-libre/PKGBUILD
Diffstat (limited to 'libre/cups-libre')
0 files changed, 0 insertions, 0 deletions