Commit 8ee5f84
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into main
# Conflicts:
# .github/workflows/build.yml
# CMakeLists.txt
# Dockerfile
# Jenkinsfile
# c++/app4triqs/app4triqs.cpp
# c++/app4triqs/app4triqs.hpp
# deps/CMakeLists.txt
# doc/documentation.rst
# doc/index.rst
# packaging/TRIQS-app4triqs-foss-2021b.eb.in
# python/app4triqs/CMakeLists.txt
# test/python/Basic.py
# test/python/CMakeLists.txt13 files changed
Lines changed: 14 additions & 524 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
84 | 89 | | |
85 | 90 | | |
86 | 91 | | |
| |||
102 | 107 | | |
103 | 108 | | |
104 | 109 | | |
105 | | - | |
106 | | - | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
107 | 113 | | |
108 | 114 | | |
109 | 115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
This file was deleted.
Binary file not shown.
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments