diff options
author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-19 14:33:42 +0000 |
---|---|---|
committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-19 14:33:42 +0000 |
commit | 113762f1086a5e202f81b35e624da3d28402d70e (patch) | |
tree | 01a607ac92caff6b0c2475ff515536cdac893984 /Wrappers/Python/conda-recipe | |
parent | d8da92d590fcab561b9e65ee57851e2e402f0cd4 (diff) | |
parent | ffe5f08c6f161485ab59496e54a8a44bc8986361 (diff) | |
download | regularization-113762f1086a5e202f81b35e624da3d28402d70e.tar.gz regularization-113762f1086a5e202f81b35e624da3d28402d70e.tar.bz2 regularization-113762f1086a5e202f81b35e624da3d28402d70e.tar.xz regularization-113762f1086a5e202f81b35e624da3d28402d70e.zip |
Merge branch 'pythonize'
Resolved Conflicts:
Core/recipe/meta.yaml
Wrappers/Python/CMakeLists.txt
Diffstat (limited to 'Wrappers/Python/conda-recipe')
0 files changed, 0 insertions, 0 deletions