Lad, Aditya 044a1924ba Merge branch 'master' into amd-master-next ...

Conflicts:
	CMakeLists.txt
	tests/src/texture/simpleTexture2DLayered.cpp
	tests/src/texture/simpleTexture3D.cpp

Change-Id: I4aa4754d391b5f37ddf15fa0bcfc84d9da020119


[ROCm/hip commit: d80edf9541]

2020-03-06 14:10:44 -05:00

..

doxygen-input

Remove incorrect executable-bit from non-executable files

2016-10-14 12:53:13 +05:30

markdown

Merge branch 'master' into amd-master-next

2020-03-06 14:10:44 -05:00