[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, upstream, updated. upstream/1.2.14-2-g288be2d

[Sylvain Le Gall]

The following commit has been merged in the upstream branch:
commit 288be2dfa61972ececaa9fb59919291dd07e85f6
Merge: 31cd11a5cb181769ef637cdc2177b83d942474b0 c5377d5bb9a91e500058c9735d35f6853d22dd5a
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Jul 7 22:55:41 2009 +0200

    Merge branch 'upstream' of git+ssh://git.debian.org//git/pkg-ocaml-maint/packages/bin-prot into upstream
    
    Conflicts:
    	.hg_archival.txt
    	.hgtags
    	Changelog
    	lib/META
    	lib/Makefile
    	lib/read_c.mli
    	lib/read_ml.ml
    	lib/read_stubs.c
    	lib/size.ml
    	lib/type_class.ml
    	lib/type_class.mli
    	lib/unsafe_read_c.ml
    	lib/utils.ml
    	lib/utils.mli
    	lib/write_ml.ml
    	lib_test/bin_prot_test.ml
    
    Conflicts:
    	.hg_archival.txt
    	.hgtags
    	Changelog
    	lib/META
    	lib/Makefile
    	lib/read_c.mli
    	lib/read_ml.ml
    	lib/read_stubs.c
    	lib/size.ml
    	lib/type_class.ml
    	lib/type_class.mli
    	lib/unsafe_read_c.ml
    	lib/utils.ml
    	lib/utils.mli
    	lib/write_ml.ml
    	lib_test/bin_prot_test.ml


-- 
bin-prot packaging