OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/renderergl2/tr_shade.c