Changeset [6d948784d5984596215f756d2c65572f962bf5a6] by Dominique Orban
Revision 6d948784d5984596215f756d2c65572f962bf5a6,
committed by Dominique Orban
· February 13th, 2013 @ 01:47 PM
Merge branch 'master' into stop-test
Conflicts:
pykrylov/linop/linop.py pykrylov/minres/minres.py
https://github.com/dpo/pykrylov/commit/6d948784d5984596215f756d2c65...
19 changed files
-
A
doc/source/linop.rst -
A
doc/source/sphinxext/inheritance_diagram.py -
A
doc/source/sphinxext/mathjax.py -
A
examples/1138bus.mtx -
A
examples/GD97_b.mtx -
A
examples/demo_cg.py -
A
examples/demo_common.py -
A
examples/demo_minres.py -
A
pykrylov/linop/blkop.py -
M
README.rst -
M
doc/source/conf.py -
M
doc/source/contents.rst -
M
doc/source/tfqmr.rst -
M
pykrylov/cg/cg.py -
M
pykrylov/linop/__init__.py -
M
pykrylov/linop/linop.py -
M
pykrylov/minres/minres.py -
M
pykrylov/tfqmr/tfqmr.py -
M
pykrylov/tools/utils.py