[python-arrayfire] 11/58: Merge remote-tracking branch 'origin/master' into devel

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-arrayfire.

commit 1b5a8d3d62ba6dab41fc13a3baf121f7dde0b90e
Merge: d051a34 86fe604
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon May 2 15:43:41 2016 -0400

    Merge remote-tracking branch 'origin/master' into devel

 CHANGELOG.md                   | 5 +++++
 arrayfire/array.py             | 1 +
 arrayfire/interop.py           | 2 +-
 arrayfire/library.py           | 2 +-
 examples/graphics/conway.py    | 2 +-
 examples/graphics/histogram.py | 2 +-
 setup.py                       | 5 +----
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --cc setup.py
index 634c341,7ffbf90..7657352
--- a/setup.py
+++ b/setup.py
@@@ -15,10 -15,10 +15,7 @@@ from setuptools import setup, find_pack
  ## 1) Look for af libraries during setup
  ## 2) Include test suite
  
--# Some hackery to avoid merge conflicts between master and devel
- current_version = "3.3.20160328"
- devel_version = "3.4.0"
 -current_version = "3.3.20160427.post1"
 -devel_version = "3.3.0"
--release_version = current_version if current_version > devel_version else devel_version
++release_version = "3.4.0"
  
  setup(
      author="Pavan Yalamanchili",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-arrayfire.git