songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
90,757 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

1602 Commits

Author SHA1 Message Date
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Mael Rouxel-Labbé 9a7d60a54e Add some Turkish characters to generate_how_to_cite.py 2019-11-19 10:50:48 +01:00
Laurent Rineau f854a2816e Prepare the publication of 4.14.2 2019-11-08 11:37:45 +01:00
Laurent Rineau 27dcff6141 Prepare CGAL-5.0 finale version 2019-11-08 10:58:29 +01:00
Laurent Rineau 1fb6abbabd Remove the debug message 2019-11-06 09:16:14 +01:00
Laurent Rineau 463a43e23b Fix the download URLS 2019-10-31 18:39:17 +01:00
Laurent Rineau 21fedbf0ad Take the version number from `public_release_name` 2019-10-31 18:34:08 +01:00
Laurent Rineau 57152023c2 Merge pull request #4304 from MaelRL/CGAL-Header_only_doc_rewrite-GF 
Documentation: switch manual to header-only by default (+misc improvements)
 2019-10-29 15:23:39 +01:00
Mael Rouxel-Labbé bcf09288f0 Fix examples.zip link 2019-10-29 11:24:39 +01:00
Mael Rouxel-Labbé 593079fab9 Tiny rephrase 2019-10-29 11:06:39 +01:00
Mael Rouxel-Labbé ead5d7478c Doc improvements 2019-10-29 11:00:39 +01:00
Mael Rouxel-Labbé 23f516d6e3 Fix missing 'D' in build type cmake variable definition in command line 2019-10-28 11:07:41 +01:00
Mael Rouxel-Labbé 5a25827958 Fix extension type of archive and directory structure 2019-10-28 11:07:41 +01:00
Sébastien Loriot 240dea6e53 update header doc 2019-10-28 10:50:59 +01:00
Laurent Rineau 0ece0ad5bf
typo 2019-10-25 16:38:57 +02:00
Mael Rouxel-Labbé 0302f1b97f Various fixes 2019-10-25 16:22:20 +02:00
Mael Rouxel-Labbé e6eb4812eb Misc Installation Documentation Updates 2019-10-25 15:52:58 +02:00
Mael Rouxel-Labbé 8978d919bd Remove duplicate configuration variable files 2019-10-25 12:53:29 +02:00
Mael Rouxel-Labbé 51fe37f49b Revert "pass on the doc" 
This reverts commit 76cc4a6863.

Actually don't want to remove that information
 2019-10-25 12:53:29 +02:00
Andreas Fabri 001c74c8df Integrate Maxime's comments 2019-10-25 12:52:38 +02:00
Andreas Fabri d4b0eae3a4 polish 2019-10-25 11:14:03 +02:00
Andreas Fabri b0916bedfe polish 2019-10-25 10:28:22 +02:00
Andreas Fabri 6d4a431b18 polish 2019-10-25 10:18:41 +02:00
Mael Rouxel-Labbé 0c70d44019 Improve introduction of Windows.txt installation page 2019-10-24 16:40:49 +02:00
Mael Rouxel-Labbé cc9776168a Add one more link to configuration variables 2019-10-24 16:34:47 +02:00
Mael Rouxel-Labbé 726e530029 Update Usage on Linux / Usage on Windows pages 2019-10-24 16:30:42 +02:00
Andreas Fabri 1a1ce7aeba Section on the Installer 2019-10-24 15:26:16 +02:00
Andreas Fabri 8ebe75c672 Merge branch 'CGAL-Header_only_doc_rewrite-GF' of github.com:MaelRL/cgal into CGAL-Header_only_doc_rewrite-GF 2019-10-24 11:01:10 +02:00
Mael Rouxel-Labbé dbac6ebd85 WIP page about Windows 2019-10-24 10:53:27 +02:00
Andreas Fabri 5a38ba5c7e small fixes 2019-10-23 15:26:35 +02:00
Mael Rouxel-Labbé 68b6387e20 Fix a warning 2019-10-23 09:12:38 +02:00
Mael Rouxel-Labbé 11caea2611 Add a note about the different ways to download CGAL 2019-10-23 09:12:03 +02:00
Mael Rouxel-Labbé 3f62323de8 Update installation manual (package managers is the recommended way) 2019-10-21 16:27:23 +02:00
Sébastien Loriot 7c63219861 Manual removal of license notice + SPDX updates 2019-10-19 17:14:18 +02:00
Mael Rouxel-Labbé b5669f5610 Another pass on the installation documentation 2019-10-19 16:18:32 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Mael Rouxel-Labbé defeee0d86 Merge branch 'CGAL-Header_only_doc_rewrite-GF-old' into CGAL-Header_only_doc_rewrite-GF 2019-10-19 13:06:45 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Sébastien Loriot 282e01c432 update SPDX tag to new version 
old tags being deprecated
 2019-10-18 21:48:06 +02:00
Sébastien Loriot 51d1c58b46 more updates 2019-10-18 10:01:05 +02:00
Sébastien Loriot 71cb5d2ccd mention vcpkg doc 2019-10-18 09:27:57 +02:00
Sébastien Loriot bbfb23181e pass on the doc 2019-10-17 15:02:47 +02:00
Sébastien Loriot 76cc4a6863 pass on the doc 2019-10-17 14:36:00 +02:00
Laurent Rineau e6da3c04f7 Merge pull request #4282 from sloriot/CGAL-doc_style_issue 
Fix doc style issue
 2019-10-15 16:31:36 +02:00
Sébastien Loriot fb5ef9ad68 fix issues in Related Functions background expension 2019-10-10 14:46:33 +02:00
Laurent Rineau b5412e7f42 Doxygen version menu 2019-09-30 16:19:18 +02:00
Laurent Rineau 1bce3f7909 Merge branch 'releases/CGAL-4.14-branch' 2019-09-27 16:25:29 +02:00
Laurent Rineau 0b66eb0d23 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	.travis/install.sh
 2019-09-27 16:24:41 +02:00
Maxime Gimeno 718421b2b9 Add a line in the Supported Compilers about MSVC and CMake 2019-09-27 15:55:25 +02:00
Mael Rouxel-Labbé 6c9cd17d0f Some more documentation updates 
+ master merge
 2019-09-23 15:44:31 +02:00
Mael Rouxel-Labbé 3b5de6fe78 More re-organization of /Documentation 2019-09-23 12:42:37 +02:00
Mael Rouxel-Labbé d5301515c7 Some more progress on cleaning the package 'Documentation' 2019-09-20 22:16:08 +02:00
Mael Rouxel-Labbé 371f4bbf3f Progress on Manual improvements 2019-09-20 17:20:15 +02:00
Simon Giraudot fff368c351 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2019-09-02 09:46:54 +02:00
albert-github 0916be515d Using links to local disks 
Using links to local disks is not a good idea
- giving the impression that a link exists / something can be seem
- will give messages about adress not understood / emptuy pages in the browser
- give problems with other output formats (not an issue yet with CGAL though)
 2019-08-31 18:35:09 +02:00
albert-github 31c22b9ac7 Incorrect lines in bib file 
- adding missing closing curly bracket (twice)
- correcting typo '|' -> '}'
 2019-08-24 14:58:15 +02:00
Necip Yildiran c482d356d7 Merging with OpenGR_wrapper, further documentation 
Merging with OpenGR_wrapper branch of remote https://github.com/necipfazil/cgal/
 2019-07-26 14:18:27 +03:00
Necip Yildiran 68013aa86c Documentation of pointmatcher registration functions 2019-07-26 13:18:28 +03:00
Sebastien Loriot 0dd30b1a68
Merge pull request #3900 from lrineau/CGAL-header_only_by_default-GF 
Make CGAL_HEADER_ONLY the default in CGAL-5.0
 2019-07-19 21:14:34 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master 
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
 2019-07-18 17:05:25 +02:00
Mael Rouxel-Labbé cd17a9486e Re-organize Manual for 5.0 (WIP) 2019-07-12 09:04:15 +02:00
Laurent Rineau e89dae2a24 Remove section "Compiler Optimizations" 
That section has been both wrong (for several releases), and useless.

Se https://doc.cgal.org/4.14/Manual/installation.html#title65
 2019-07-11 15:30:09 +02:00
Laurent Rineau 4342262420 Remove the section "Custom Flags in the Programs Using CGAL" 
That section is completely outdated.
See https://doc.cgal.org/4.14/Manual/installation.html#title46
 2019-07-11 15:29:59 +02:00
Laurent Rineau c249351ef8 First pass on the documentation 2019-07-11 15:29:39 +02:00
Laurent Rineau 9a40d573b9 Easy fix 2019-07-11 15:29:05 +02:00
Mael 47c247ae72
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-10 15:36:25 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF 
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
 2019-07-10 14:22:53 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Mael f40f8e4190
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-01 11:24:11 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Simon Giraudot 6a43faceff Documentation of registration functions (user + ref + biblio) 2019-06-26 11:31:04 +02:00
Laurent Rineau 2ce7800239 Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL 2019-06-24 14:27:20 +02:00
Laurent Rineau 7afa2cae6c Remove section "Compiler Optimizations" 
That section has been both wrong (for several releases), and useless.

Se https://doc.cgal.org/4.14/Manual/installation.html#title65
 2019-06-19 15:33:43 +02:00
Laurent Rineau 05ce1ffe4d Remove the section "Custom Flags in the Programs Using CGAL" 
That section is completely outdated.
See https://doc.cgal.org/4.14/Manual/installation.html#title46
 2019-06-19 15:28:27 +02:00
Laurent Rineau de6135fd10 First pass on the documentation 2019-06-19 15:18:00 +02:00
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 77711e4e71 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé 431d07effb Add a note about Ceres in the installation manual 2019-06-19 10:16:37 +02:00
Laurent Rineau e260ea1dd4 C++11: remove the need for Boost.Thread, even with CGAL_Core 2019-06-18 15:06:23 +02:00
Laurent Rineau d3f595b1fc Easy fix 2019-06-17 15:07:13 +02:00
Laurent Rineau a6514fdfad Merge branch 'master' into Scripts-simplify_user_scripts-GF 2019-06-06 10:11:23 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé a120290675 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-05-15 14:31:00 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00
Laurent Rineau 62ed2385cf Remove documentation of "preconfigured" dependencies 2019-05-07 11:12:42 +02:00
Laurent Rineau fcf633c9d5 Remove OpenGL from the dependencies of CGAL 2019-05-07 11:07:52 +02:00
Laurent Rineau ba2bf5e506 Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF 
Document that Qt 5.9 or later is required
 2019-05-06 15:30:24 +02:00
Laurent Rineau dd703beff1 Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF 
Document that Qt 5.9 or later is required
 2019-05-06 15:01:58 +02:00
Laurent Rineau 92a244ad94 wording 2019-04-30 16:52:01 +02:00
Laurent Rineau 9ec3481be2 Document that Qt 5.9 or later is required 2019-04-30 16:41:44 +02:00
Dmitry Anisimov 6e33c7b22b
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-04-24 10:34:23 +02:00
Sebastien Loriot 14a9a78c2f
Merge pull request #3821 from afabri/CGAL-links2-GF 
CGAL:Fix missing links after Albert's review
 2019-04-23 09:45:06 +02:00
Dmitry Anisimov 13d0156482 fixed docs, references, biblio, and license 2019-04-22 13:06:20 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
Sébastien Loriot 2eb411d337 update Eigen links 2019-04-11 21:37:05 +02:00
albert-github 1dd7473818 Correction of links 
Correction of redirected links and links that moved to another place.
 2019-04-11 21:37:05 +02:00
Laurent Rineau f33addc4cc Update the Javascript menu of the documentation 2019-04-05 15:14:02 +02:00
Laurent Rineau 5d56dff72f Late update or menu_version.js 2019-04-03 10:59:01 +02:00
Andreas Fabri 8a6688e638 Replace some www-sop.inria.fr/prisme with hal.inria.fr 2019-04-02 18:36:06 +02:00
Guillaume Damiand 2f046604b6 First working version of Face_graph_wrapper. 2019-04-01 19:26:56 +02:00
Andreas Fabri 39edf75ff2 Fix missing links after Albert's review 2019-04-01 10:26:20 +02:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF 
Some Documentation Fixes for Issue #3457
 2019-03-27 18:05:17 +01:00
Laurent Rineau 42e47267e2 Merge pull request #3798 from sloriot/CGAL-doc_release_from_Ic 
Fix for the doc of a release built from an Ic
 2019-03-27 18:05:15 +01:00
Sébastien Loriot 1b94dd4189 fix the last non-relative link 2019-03-27 17:12:37 +01:00
Guillaume Damiand 379c90420b Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2019-03-27 12:40:33 +01:00
Laurent Rineau 138b26db9d Merge pull request #3798 from sloriot/CGAL-doc_release_from_Ic 
Fix for the doc of a release built from an Ic
 2019-03-26 17:01:46 +01:00
Sébastien Loriot 387843d946 Ignore -Ic-XXX for the version in the doc 2019-03-26 14:45:17 +01:00
Sébastien Loriot ab534c5e60 use relative path 2019-03-26 14:45:06 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Andreas Fabri ab0544514c Change ruu.nl to uu.nl although the links are often outdated 2019-03-20 08:43:07 +01:00
Andreas Fabri 7c2674abc8 More links fixed 2019-03-20 08:38:40 +01:00
Andreas Fabri e254a770df Some Fixes for #3457 2019-03-19 19:20:40 +01:00
Laurent Rineau 60478dd816 Merge pull request #3758 from albert-github/feature/bug_advanced_2 
Correction of (X)HTML warnings in case of Advanced topics
 2019-03-19 18:30:53 +01:00
Laurent Rineau ed8be0d44a Merge pull request #3771 from sloriot/Doc-generate_deprecation_notice 
Use a generated version of deprecated.html

# Conflicts:
#	Documentation/doc/resources/1.8.13/deprecated.html
#	Documentation/doc/resources/1.8.14/deprecated.html
#	Documentation/doc/resources/1.8.4/deprecated.html
 2019-03-19 18:28:58 +01:00
Laurent Rineau d89b70dd9a Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-19 18:25:32 +01:00
albert-github 28fdb2d425 Correction of (X)HTML warnings in case of Advanced topics 
Based on suggestion of @sloriot using `^^` also in cgalAdvancedEnd instead of adding a new line in the files
 2019-03-15 11:33:48 +01:00
Sébastien Loriot 6a7c377b40 Use a generated version of deprecated.html 2019-03-15 08:57:40 +01:00
Laurent Rineau e32637fa7c Merge pull request #3719 from albert-github/feature/bug_packages_html 
Invalid (X)HTML sequence
 2019-03-11 17:26:27 +01:00
albert-github 8b7f0bcb1e Correction of (X)HTML warnings in case of Advanced topics 
Based on #3713 a  number of problems were solved, but also some new issues introduced.
- BaseDoxyfile.h see to it that the CGALAdvancedBegin is in a detailed part, so be sure to terminate the brief part by an extra carriage return
- commands like \pre, \note read till the beginning of the next section but a \htmlonly is not seen as a section separator, so insert an extra carriage return
- some places  missed an "Advanced" indicator, used the cgalAdvancedType here.

##Note
in Periodic_2_triangulation_2.h there appear to be a number of images that are a bit in thin air (Captions: "Insertion of a point on an edge." and "Insertion in a face."). Also just above these images theer are a number of functions that have documentation, but this is non-doxygen documentation and as such not seen by doxygen
 2019-03-10 16:00:52 +01:00
Laurent Rineau f5836b2206 Merge branch 'releases/CGAL-4.13-branch' 2019-03-07 14:31:16 +01:00
Laurent Rineau 99fe1bc548 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-07 14:26:47 +01:00
Laurent Rineau 49653dedd8 Merge pull request #3724 from albert-github/feature/bug_manual_tags 
Inconsistent tags for (X)HTML output (Manual)
 2019-03-05 16:20:51 +01:00
Sébastien Loriot 3887a21429 add missing text for brief of advanced class/type/function/concept 2019-03-05 08:01:17 +01:00
Sébastien Loriot f058854904 rename macro + apply to all version config files 2019-03-04 08:57:10 +01:00
albert-github 5d3ee5f9ee Inconsistent tags for (X)HTML output (Manual) 
The xhtml lint checker gave:
`parser error : Opening and ending tag mismatch: div line 375 and p`

Solved by making the `\htmlonly` into `\htmlonly[block]` to prevent invalid HTML
 2019-03-01 20:06:22 +01:00
Maxime Gimeno 7be874c464 Merge pull request #3717 from albert-github/feature/bug_cite_html 
File not (X)HTML compliant
 2019-03-01 17:05:26 +01:00
Laurent Rineau e08a3af2c4 Update supported platforms 2019-03-01 16:27:34 +01:00
Laurent Rineau 01e5727a50 Prepare CGAL-4.14-beta1 2019-03-01 16:27:11 +01:00
albert-github 2f3aeb7b9b Invalid (X)HTML sequence 
Based on the discussion an updated implementation dropping the post processing step in favor of a `<div style=..` implementation
 2019-02-28 19:29:49 +01:00
albert-github b90115d3f2 Invalid (X)HTMLsequence 
In packages.html we get:
`Element style is not declared in p list of possible children`
as the `style` tag is only allowed in the `head` part of a file.

The specific changes are only needed for this one file, so it has been implemented using the post processing facility of te CGAL documentation generation.
 2019-02-28 18:18:01 +01:00
albert-github 97b2bd3b5b File not (X)HTML compliant 
Made generated file (X)HTML compliant
 2019-02-28 11:41:20 +01:00
albert-github 6dcb44622f Small documentation correction 
Documentation had double "in the"
 2019-02-27 13:37:45 +01:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov 
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
 2019-02-22 16:39:12 +01:00
FrancisGipsa 46fde27a91 add two references 2019-02-20 17:16:58 +01:00
Sébastien Loriot 50a59c3096 add new macros to be used in classified reference manual 2019-02-14 10:27:26 +01:00
Laurent Rineau 50d501309c Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-02-13 15:39:58 +01:00
Laurent Rineau 2fa9206735 Merge pull request #3675 from sloriot/Doc-fix_nav_tree_hack 
fix navtree hack
 2019-02-13 15:38:10 +01:00
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +01:00
Sébastien Loriot d6cb114940 fix navtree hack 
in recent doxygen version hash is always '#' making our check failing
The fix is to fallback to default used later one
 2019-02-11 16:35:03 +01:00
Laurent Rineau 1a45e1c753 Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF 
[Small Feature] Classification: Neural Network and parallelized Random Forest
 2019-02-07 13:31:20 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie 
New package: Surface_mesh_approximation
 2019-01-22 09:17:35 +01:00
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00