[Numpy-svn] [numpy/numpy] 5941fc: BUG: object array np.conjugate, ndarray.conjugate ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 5941fc9d9f15cd773b6c3989091a4b7ef96a1c30
      https://github.com/numpy/numpy/commit/5941fc9d9f15cd773b6c3989091a4b7ef96a1c30
  Author: Eric Moore <ewm at redtetrahedron.org>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/calculation.c
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  BUG: object array np.conjugate, ndarray.conjugate inconsistent

fixes gh-4730


  Commit: 3b5f871606a758f8bf19981b06f423792cbdc5f4
      https://github.com/numpy/numpy/commit/3b5f871606a758f8bf19981b06f423792cbdc5f4
  Author: Julian Taylor <juliantaylor108 at gmail.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/calculation.c
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  Merge pull request #4887 from ewmoore/conj_obj

BUG: object array np.conjugate, ndarray.conjugate inconsistent


Compare: https://github.com/numpy/numpy/compare/236ca8b7e989...3b5f871606a7