Changeset fdd7425 in libros

Timestamp:
May 6, 2014, 10:00:35 AM (10 years ago)
Author:
cualquiera <cualquiera@…>
Branches:
master, revisionfinal
Children:
bf4d830
Parents:
c0dca75 (diff), 7bcf951 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Conflicto
Merge branch 'master' of https://tibisay.cenditel.gob.ve/publicaciones/scm/git/libros

Conflicts:

maquetacion/compilacion.pdf

Location:
maquetacion
Files:
4 added
11 edited

Note: See TracChangeset for help on using the changeset viewer.