[Numpy-svn] [numpy/numpy] 8b0739: Merge branch 'einsum_changes' of https://github.co...

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/numpy/numpy

Commit: 8b07398ec434a0082a1b95cf3683d7a17030bd68
    https://github.com/numpy/numpy/commit/8b07398ec434a0082a1b95cf3683d7a17030bd68
Author: Charles Harris <charlesr.harris at gmail.com>
Date:   2011-02-03 (Thu, 03 Feb 2011)

Changed paths:
  M numpy/add_newdocs.py
  M numpy/core/code_generators/numpy_api.py
  M numpy/core/src/multiarray/einsum.c.src
  M numpy/core/src/multiarray/multiarraymodule.c
  M numpy/core/src/multiarray/new_iterator.c.src
  A numpy/core/tests/test_einsum.py
  M numpy/core/tests/test_new_iterator.py
  M numpy/core/tests/test_numeric.py

Log Message:
-----------
Merge branch 'einsum_changes' of https://github.com/m-paradox/numpy into einsum-changes


Commit: d37bf941f4e7437dbadce6f207560352802f0ca6
    https://github.com/numpy/numpy/commit/d37bf941f4e7437dbadce6f207560352802f0ca6
Author: Charles Harris <charlesr.harris at gmail.com>
Date:   2011-02-03 (Thu, 03 Feb 2011)

Changed paths:
  M numpy/core/src/multiarray/arraytypes.c.src
  M numpy/core/src/multiarray/calculation.c
  M numpy/core/src/multiarray/conversion_utils.c
  M numpy/core/src/multiarray/convert.c
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/ctors.c
  M numpy/core/src/multiarray/dtype_transfer.c
  M numpy/core/src/multiarray/einsum.c.src
  M numpy/core/src/multiarray/getset.c
  M numpy/core/src/multiarray/item_selection.c
  M numpy/core/src/multiarray/mapping.c
  M numpy/core/src/multiarray/methods.c
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/multiarray/new_iterator_pywrap.c
  M numpy/core/src/multiarray/numpyos.c
  M numpy/core/src/multiarray/refcount.c
  M numpy/core/src/multiarray/sequence.c
  M numpy/core/src/multiarray/shape.c
  M numpy/core/src/multiarray/testcalcs.py
  M numpy/core/src/multiarray/usertypes.c

Log Message:
-----------
WHT: Whitespace cleanup.


Commit: 31725765f5ce04a96b3bb53728756d135577fbdf
    https://github.com/numpy/numpy/commit/31725765f5ce04a96b3bb53728756d135577fbdf
Author: Charles Harris <charlesr.harris at gmail.com>
Date:   2011-02-03 (Thu, 03 Feb 2011)

Changed paths:
  M numpy/core/src/multiarray/arraytypes.c.src

Log Message:
-----------
BUG: Fix a compiler warning.