genomeprivacy into develop
212c6d5cb133
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on Jun 13 2014, 00:44.

Description

Merge branch 'develop' of https://git.epfl.ch/repo/genomeprivacy into develop

Conflicts:
report/sections/performance_analysis.tex

Committed

Franck Youssef <franck.youssef@epfl.ch>

Jun 13 2014, 00:44

Pushed

raisaro

Apr 20 2017, 12:42

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
98c7c8569cac	Franck Youssef	REPORT: various updates. completed section introduction. Need to be checked.	Jun 11 2014
25051acf9a57	Franck Youssef	ECCEG: request Jean Louis, are numbers correctly wrapped if they exceed k=n or…	Jun 10 2014
00d2baa5626c	Franck Youssef	REPORT: various updates	Jun 10 2014

		Path
A		documentation/meetings/meeting ayday raisaro youssef 20140608.docx
A		documentation/meetings/meeting ayday raisaro youssef 20140608.pdf
A	(dir)	project/PPPCommons/src/test/
A		project/PPPCommons/src/test/FieldSizeTest.java
M		report/biblio/research.bib
A	(dir)	report/external_sty/
A		report/external_sty/tikz-uml.sty
M		report/sections/appendix/appendix_add_material.tex
M		report/sections/appendix/appendix_specs.tex
M		report/sections/crypto_background.tex
M		report/sections/deployment.tex
A		report/sections/diagrams/web_service_full.pdf
P		report/sections/diagrams/web_service_full.vsdx Copied from report/sections/diagrams/web_service_decrypt.vsdx
M		report/sections/ecceg_impl.tex
M		report/sections/intro.tex
M		report/sections/performance_analysis.tex
M		report/youssef-genomic.tex