Michael Pratt 218b12c557 Merge branch 'master' into python2and3

2014-08-06 01:45:07 -04:00

..

python2

Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH

2014-07-31 03:27:06 -04:00

python3

Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH

2014-07-31 03:27:06 -04:00

src2

temporarily disabled java bindings for ml; hopefully fixed warnings etc.

2014-08-03 04:28:20 +04:00

test

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

CMakeLists.txt

fix python module compilation with enabled CUDA support:

2014-08-04 12:12:51 +04:00

common.cmake

Merge branch 'master' into python2and3

2014-08-06 01:45:07 -04:00