summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-11-30 01:00:18 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-11-30 01:00:18 -0300
commitb021874d73c9dded2e05f2095efa5c3a6d23b496 (patch)
treeb2b9a7bd88f0476accd17d23c1ef53c7cc920be7 /doc
parent73b813613aa08646515f4e06c71503b18125cec3 (diff)
parentba312fb72ec0843297978796a20c6ffc1fe3ef6e (diff)
Merge branch 'master' of http://projects.parabolagnulinux.org/libretools
Conflicts: src/aur src/chroot-tools/librechroot src/librerepkg
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions