Michael Hemmer 5767addb9c Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer ... Conflicts: Documentation/biblio/cgal_manual.bib Documentation/biblio/geom.bib Documentation/doxyassist.xml		2015-03-26 16:26:15 +01:00
..
cgal_manual.bib	Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer	2015-03-26 16:26:15 +01:00
geom.bib	Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer	2015-03-26 16:26:15 +01:00