diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-06-07 15:35:59 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-06-07 15:35:59 +0100 |
| commit | 2fa4ef8cdb4ccc420007b65d975682c9939e0171 (patch) | |
| tree | 37a8a430cb322cc1f315132c9fbe882e47a6a1c1 /LICENSE | |
| parent | 14e06f7ad88202114b22ed478ba6efab952fa30b (diff) | |
| parent | 68d716ff14264bfaac8c9311d435530689382e7e (diff) | |
| download | framework-2fa4ef8cdb4ccc420007b65d975682c9939e0171.tar.gz framework-2fa4ef8cdb4ccc420007b65d975682c9939e0171.tar.bz2 framework-2fa4ef8cdb4ccc420007b65d975682c9939e0171.tar.xz framework-2fa4ef8cdb4ccc420007b65d975682c9939e0171.zip | |
Merge branch 'composite_operator_datacontainer' into update_demo
Conflicts:
Wrappers/Python/ccpi/optimisation/operators/GradientOperator.py
Wrappers/Python/ccpi/optimisation/operators/SymmetrizedGradientOperator.py
Wrappers/Python/test/test_functions.py
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions