diff options
author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2021-11-08 10:47:09 +0100 |
---|---|---|
committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2021-11-08 10:47:09 +0100 |
commit | d670769d113c7621d2260ac08c2961dd73ce8cb4 (patch) | |
tree | f4080ecfda544a2c4062d9ca24e4091cf6ea48ea /src/Coxeter_triangulation/doc/two_triangulations.png | |
parent | 11b8a288946c953472165ffbb5dbfbeb5ca64d26 (diff) | |
parent | cfb60a50a7c3aea08abc41118fbfdf31061a44a4 (diff) |
Merge master and resolve conflicts (mainly src/python/CMakeLists.txt)
Diffstat (limited to 'src/Coxeter_triangulation/doc/two_triangulations.png')
-rw-r--r-- | src/Coxeter_triangulation/doc/two_triangulations.png | bin | 0 -> 39507 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/Coxeter_triangulation/doc/two_triangulations.png b/src/Coxeter_triangulation/doc/two_triangulations.png Binary files differnew file mode 100644 index 00000000..055d93e7 --- /dev/null +++ b/src/Coxeter_triangulation/doc/two_triangulations.png |