[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/0.20081112+gitBB342A7-1-394-ge0e5b81

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 6bd3cd16318e3e29ec9abf41a55a768b5bb6baae
Merge: 83f2298d15d350c81c70cf643300c7ad5fb7845c b9ca4ff50a8d56d4c9a4c8e03e5f7422ea617f5b
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 28 23:07:02 2009 +0100

    Merge branch 'upstream'
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index e4ca5b7,a846b6b..4639a88
--- a/.gitignore
+++ b/.gitignore
@@@ -1,11 -1,12 +1,13 @@@
 +debian/patches/
- _build/
+ *~
+ _build
  Makefile
- autom4te.cache/
- configure
+ autom4te.cache
  config.ml
  config.log
  config.status
+ config.post
+ configure
  build/META
  build/threaded/META
  build/nothreads/META

-- 
ocaml-batteries packaging