| #
f2dee214
|
| 06-Mar-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into jed/chem
Note merging a branch with good stuff in it for a year and a half is insane!
Conflicts:
src/ts/examples/tutorials/makefile
src/ts/interface/ts.c
|
| #
89103215
|
| 02-Mar-2015 |
Matthew G. Knepley <knepley@gmail.com> |
Configure: Objects should not use log or argDB from framework
|
| #
a197972a
|
| 11-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c
show more ...
|
| #
50705773
|
| 10-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile
Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile
|
| #
6aeb920f
|
| 15-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-prefix-installs'
Conflicts:
config/BuildSystem/config/packages/__init__.py
config/BuildSystem/config/packages/hdf5.py
config/BuildSystem/config/packages/make.py
|
| #
06e08bc7
|
| 09-Sep-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
removed PETSc.package.NewPackage and moved all packages to one location
|