| #
bf5b0b0b
|
| 25-Feb-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
020631bc
|
| 19-Feb-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
Conflicts:
include/petscsnesfas.h
|
| #
1f1b5a69
|
| 15-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/ts-rhsjacobian-only
|
| #
6d808a57
|
| 13-Feb-2014 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Merge branch 'shri/update-SuiteSparse' into shri/external-package-KLU
Conflicts:
conf/test
config/examples/arch-linux-pkgs-dbg-ftn-interfaces.py
config/examples/arch-linux-pkgs-opt.py
|
| #
a7b5fb5f
|
| 08-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'balay/tao-to-petsc'
Conflicts:
src/snes/impls/fas/fasfunc.c
src/snes/impls/fas/fasgalerkin.c
|
| #
bc0f3ec4
|
| 26-Nov-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: fix LIBRARY -> LIBBASE in makefile
|
| #
3d604a72
|
| 25-Nov-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: fix LOCDIR in makefiles
|
| #
d7fec080
|
| 25-Nov-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: switch src makefiles form using tao/conf to petsc/conf
|
| #
a7e14dcf
|
| 25-Nov-2013 |
Satish Balay <balay@mcs.anl.gov> |
tao: move tao/src/* petsc/src/tao/
|