Merge branch 'ee364a_atoms' of git://github.com/cvxgrp/Convex.jl into… · jump-dev/Convex.jl@8ea114c · GitHub

Commit

Merge branch 'ee364a_atoms' of git://github.com/cvxgrp/Convex.jl into…

Browse files

… ee364a_atoms

Conflicts:
	test/run_tests.jl

Loading branch information

davidlizeng committed Jan 2, 2015

2 parents 3e00a82 + 476ee45 commit 8ea114c