atimofee f43e55503f Merge branch 'master' of https://github.com/GPUOpen-ProfessionalCompute-Tools/HIP-hipify ...

Conflicts:
	src/Cuda2Hip.cpp


[ROCm/clr commit: 1b926d03b5]

2016-03-01 21:51:01 +03:00

..

clr/hipamd

Merge branch 'master' of https://github.com/GPUOpen-ProfessionalCompute-Tools/HIP-hipify

2016-03-01 21:51:01 +03:00