Module Name: src Committed By: spz Date: Sat May 14 14:39:39 UTC 2016
Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: shl.mi src/external/mit/expat/dist/conftools: ac_c_bigendian_cross.m4 mkinstalldirs src/external/mit/expat/dist/lib: xmlparse.c src/external/mit/expat/lib/libexpat: Makefile expat_config.h shlib_version Added Files: src/external/mit/expat/lib/libexpat: expat.pc.in Log Message: merge conflicts, bump shlib version, add expat.pc To generate a diff of this commit: cvs rdiff -u -r1.770 -r1.771 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2034 -r1.2035 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.132 -r1.133 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 \ src/external/mit/expat/dist/conftools/mkinstalldirs cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmlparse.c cvs rdiff -u -r1.1 -r1.2 src/external/mit/expat/lib/libexpat/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/expat/lib/libexpat/expat.pc.in cvs rdiff -u -r1.2 -r1.3 src/external/mit/expat/lib/libexpat/expat_config.h \ src/external/mit/expat/lib/libexpat/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.