• Shane Snyder's avatar
    Merge branch 'dev-modular' into mmap-dev · 265bdaba
    Shane Snyder authored
    Conflicts:
    	darshan-runtime/Makefile.in
    	darshan-runtime/darshan-core.h
    	darshan-runtime/lib/darshan-core.c
    	darshan-util/Makefile.in
    	darshan-util/darshan-bgq-logutils.c
    	darshan-util/darshan-diff.c
    	darshan-util/darshan-hdf5-logutils.c
    	darshan-util/darshan-logutils.c
    	darshan-util/darshan-mpiio-logutils.c
    	darshan-util/darshan-null-logutils.c
    	darshan-util/darshan-parser.c
    	darshan-util/darshan-pnetcdf-logutils.c
    	darshan-util/darshan-posix-logutils.c
    265bdaba
darshan-mpiio-log-format.h 5.06 KB