• Deike Kleberg's avatar
    Merge branch 'master' into cdi-pio · d2de7a65
    Deike Kleberg authored
    Conflicts:
    	Makefile.in
    	app/Makefile.in
    	configure
    	configure.ac
    	examples/Makefile.in
    	interfaces/Makefile.in
    	src/Makefile.am
    	src/Makefile.in
    	src/cdi.inc
    	src/config.h.in
    	src/make_cdilib
    	src/stream_grb.c
    	tests/Makefile.in
    d2de7a65
calendar.c 6.95 KB