Make all GLSL shaders use the same set of uniforms.
Consolidate architecture names

amd64, x64, x86_64 -> x86_64
i386, i86pc, x86 -> x86
powerpc, ppc -> ppc
powerpc64, ppc64 -> ppc64
axp -> alpha

Some exceptions are made for the actual build product names
Merge mingw build scripts
Add jenkins-ci-build.sh
Fix cross-make-mingw.sh when no ARCH is supplied
Fix comment grammar (and test jenkins)
Ditch 'historical compatibility' and use 'logic' instead
Add DEBUG_MAKEFILE to... debug the Makefile
Move cross-make-mingw.sh's functionality to the Makefile and remove it
Fix travis build
(Hopefully) fix the Jenkins build
Fix it more
Make travis silent
Use distclean for jenkins builds
(bug #5904) Fix OpenBSD and Solaris builds
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	.travis.yml
	Makefile
	code/renderergl2/tr_shade.c
	make-macosx-ub.sh
	make-macosx.sh
	travis-ci-build.sh
Enable travis irc notifications for Spearmint
Merge remote-tracking branch 'spearmint/master'

Conflicts:
	make-macosx-ub.sh
	make-macosx.sh