• Shane Snyder's avatar
    Merge branch 'master' into mmap-dev · a974efee
    Shane Snyder authored
    Conflicts:
    	darshan-runtime/Makefile.in
    	darshan-runtime/configure
    	darshan-runtime/configure.in
    	darshan-runtime/darshan.h
    	darshan-runtime/lib/darshan-core.c
    	darshan-runtime/lib/darshan-hdf5.c
    	darshan-runtime/lib/darshan-mpiio.c
    	darshan-runtime/lib/darshan-pnetcdf.c
    	darshan-runtime/lib/darshan-posix.c
    	darshan-util/Makefile.in
    	darshan-util/darshan-convert.c
    	darshan-util/darshan-logutils.c
    	darshan-util/darshan-logutils.h
    	darshan-util/darshan-parser.c
    a974efee
Name
Last commit
Last update
darshan-runtime Loading commit data...
darshan-test Loading commit data...
darshan-util Loading commit data...
doc Loading commit data...
maint/config Loading commit data...
COPYRIGHT Loading commit data...
ChangeLog Loading commit data...
README.md Loading commit data...
darshan-bgq-log-format.h Loading commit data...
darshan-hdf5-log-format.h Loading commit data...
darshan-log-format.h Loading commit data...
darshan-mpiio-log-format.h Loading commit data...
darshan-null-log-format.h Loading commit data...
darshan-pnetcdf-log-format.h Loading commit data...
darshan-posix-log-format.h Loading commit data...