Timestamp:
May 13, 2014, 11:54:51 AM (10 years ago)
Author:
Antonio Araujo Brett <aaraujo@…>
Branches:
master, revisionfinal
Children:
afd4f50
Parents:
ea64a13 (diff), 342b9da (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:

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

Conflicts:

maquetacion/compilacion.pdf

(No files)

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