Merge with next

This commit is contained in:
Guillaume Damiand 2011-10-11 12:37:52 +00:00
commit ff4def4e45
4 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@
\label{chapterArrangement_on_surface_2}
\ccChapterRelease{\ArrangementOnSurfaceRev. \ \ArrangementOnSurfaceDate}
\ccChapterAuthor{Ron Wein, Efi Fogel, Baruch Zukerman, Dan Halperin, Eric Berberich, and Oren Zalzman}
\ccChapterAuthor{Ron Wein \and Eric Berberich \and Efi Fogel \and Dan Halperin \and Michael Hemmer \and Oren Salzman \and Baruch Zukerman}
\input{Arrangement_on_surface_2/PkgDescription.tex}

View File

@ -1 +1,2 @@
unique_sqrt_extension-sloriot
global_function_solve_1-hemmer

View File

@ -80,7 +80,7 @@
}
@INCOLLECTION{cgal:h-ma-11b,
AUTHOR = {Michael Hemmer},
AUTHOR = {Michael Hemmer and Sylvain Pion},
BOOKTITLE = {{CGAL} User and Reference Manual},
PUBLISHER = {{CGAL Editorial Board}},
TITLE = {Modular Arithmetic},
@ -317,8 +317,7 @@
}
@INCOLLECTION{cgal:wfzh-a2-11b,
AUTHOR = {Ron Wein and Efi Fogel and Baruch Zukerman and
Dan Halperin},
AUTHOR = {Ron Wein and Eric Berberich and Efi Fogel and Dan Halperin and Michael Hemmer and Oren Salzman and Baruch Zukerman},
BOOKTITLE = {{CGAL} User and Reference Manual},
PUBLISHER = {{CGAL Editorial Board}},
TITLE = {{2D} Arrangements},

View File

@ -1,6 +1,6 @@
\cleardoublepage
\ccUserChapter{Modular Arithmetic\label{chap:modular_arithmetic}}
\ccChapterAuthor{Michael Hemmer}
\ccChapterAuthor{Michael Hemmer \and Sylvain Pion}
\input{Modular_arithmetic/PkgDescription.tex}