nifty/operators/nifty_minimization.py · 221486b1c421d05e4fac2841de1ba08b0870ce77 · ift / NIFTy · GitLab

Find file Blame History Permalink

Merge branch 'master' into NIFTy3_temp · 221486b1
theos authored Sep 24, 2016
```
# Conflicts:
#	lm/__init__.py
#	lm/nifty_lm.py
#	rg/nifty_fft.py
```
221486b1