From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Mon, 26 Sep 2011 20:51:46 +0000 (+0300)
Subject: Merge commit 'upstream/2_rc1' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~193^2~7^2~71
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25e06076520a0972241384652c0472644cf5f005;p=mathgl.git

Merge commit 'upstream/2_rc1' into experimental

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/requests
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	lang/numpy.i
	texinfo/Makefile.in
---

25e06076520a0972241384652c0472644cf5f005
diff --cc lang/numpy.i
index 3757077,25d1f1a..2106bdc
--- a/lang/numpy.i
+++ b/lang/numpy.i
@@@ -111,7 -111,7 +111,11 @@@
      if (PyModule_Check(  py_obj)) return "module"      ;
      if (PyInstance_Check(py_obj)) return "instance"    ;
  
++<<<<<<< HEAD
 +    return "unknown type";
++=======
+     return "unknow type";
++>>>>>>> upstream/2_rc1
    }
  
    /* Given a NumPy typecode, return a string describing the type.