Merge branch 'master' of https://github.com/epfl-lts2/unlocbox

Author: Nathanael Perraudin

prox/prox_tv1d.m

@@ -169,7 +169,7 @@
                 else
                     % c2)
                     if umax > 0
-                        for jj = k0:kminus
+                        for jj = k0:kplus
                             sol(jj,ii) = vmax;
                         end
                         k = kplus + 1;   k0 = kplus + 1; kplus = kplus + 1;