Maxime Gimeno 2a49dfcb05 Fix conflict		2019-01-11 09:47:34 +01:00
..
Documentation	Move Heat_method_3 in Documentation/dependencies to make merge into integration easier	2018-11-12 13:52:33 +01:00
biblio	Fix conflict	2019-01-11 09:47:34 +01:00
resources	Merge pull request #3518 from albert-github/feature/bug_xhtml_address	2018-12-19 16:08:21 +01:00
scripts	XHTML address of dtd	2018-12-08 13:28:28 +01:00
CMakeLists.txt	XHTML Problems regarding tag sequences	2018-12-11 19:31:25 +01:00
Customizations.txt	Renamed sweep-line to surface-sweep and cleaned up	2017-05-27 12:30:41 +03:00