Ignore:
Timestamp:
Apr 28, 2014, 11:42:44 AM (10 years ago)
Author:
Antonio Araujo Brett <aaraujo@…>
Branches:
master, revisionfinal
Children:
aab7301
Parents:
dcee5d3 (diff), 0e5d8cd (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • maquetacion/capitulo5/capitulo5.tex

    r5a86311 rdcee5d3  
    11\chapter{Certificaci\'on Electr\'onica}
     2\label{capitulo5}
    23\chapterauthors{V. Bravo y A. Araujo
    34\chapteraffil{Fundación Centro Nacional de Desarrollo e Investigación en Tecnologías Libres}
    45}
     6
     7
     8
     9
    510
    611
Note: See TracChangeset for help on using the changeset viewer.