[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, features/flexi-build, updated. upstream/0.20081011-70-g1d14ed7

[Stefano Zacchiroli]

The following commit has been merged in the features/flexi-build branch:
commit 1d14ed74c71941ad53f8f2578f39cac3d26a20ab
Merge: 467d979ff9d45df607c37cfbc6eed76c77ce8a1c 2f8313bc0a6297730f3571a1d0332498c85411a5
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Oct 31 23:54:11 2008 +0100

    Merge commit 'refs/top-bases/features/flexi-build' into features/flexi-build
    
    accept upstream version as conflict resolution, all the patches
    belonging to this branch have been integrated there
    
    Conflicts:
    
    	Makefile


-- 
ocaml-batteries packaging