• 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
configure 160 KB