Timestamp:
Jul 9, 2014, 5:08:51 PM (10 years ago)
Author:
cualquiera <cualquiera@…>
Branches:
master, revisionfinal
Children:
db943f9, facce2b
Parents:
6a2d170 (diff), 3dfd26e (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/bibliografia.bib
maquetacion/capitulo1/conceptosBasicos.tex
maquetacion/compilacion.pdf
maquetacion/compilacion.synctex.gz

File:
1 added

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