Skip to content

Commit 363fbd1

Browse files
committed
Merge branch 'master' into devel
2 parents ca848fa + f5efab4 commit 363fbd1

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### v3.3.20160328
2+
- Fixes to make arrayfire-python to work on 32 bit systems
3+
14
### v3.3.20160320
25
- Feature parity with Arrayfire 3.3 libs
36
- Functions to interact with arryafire's internal data structures.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
## 2) Include test suite
1717

1818
# Some hackery to avoid merge conflicts between master and devel
19-
current_version = "3.3.20160320"
19+
current_version = "3.3.20160328"
2020
devel_version = "3.4.0"
2121
release_version = current_version if current_version > devel_version else devel_version
2222

2323
setup(
2424
author="Pavan Yalamanchili",
2525
author_email="[email protected]",
2626
name="arrayfire",
27-
version=release_version
27+
version=release_version,
2828
description="Python bindings for ArrayFire",
2929
license="BSD",
3030
url="http://arrayfire.com",

0 commit comments

Comments
 (0)