[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20090223-5-10-g3e26f12

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a6325cca745e752d743e9552b86c984e3784bdc1
Merge: b7b16d89830a26d0da452793e44f4275493ea858 e0a4f46ea1351cca7dbba00e80c6ba15d7ad946d
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 2 15:24:34 2011 +0200

    Merge commit 'upstream/1.2.0'

diff --combined .gitignore
index 845ca06,bc8bc8e..c269fa4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,17 +1,18 @@@
+ # ignore build-related files
+ src/.depend
+ 
+ # ignore object files
+ *.[oa]
+ *.so
+ *.cm[iox]
+ *.cma
+ *.cmxa
+ 
+ # ignore autoconf-related files
+ aclocal.m4
+ autom4te.cache
+ config.log
+ config.make
+ config.status
+ configure
 +.pc

-- 
cairo-ocaml packaging