Skip to content
Commit b70ee8d2 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'gert' into try-merge-gert 

Conflicts:

	Makefile.in
	src/python/gpuarray.py
parents 7a87c085 d9ec83a4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment