Spelling mistake pointed out by zturtleman
The Makefile imported was not up-to-date. Especially the clang changes.
Changes from ioquake3 taken with:
git diff c2e2514efc90c6cc61f96e883779c36b0d320826 cf7d8ef9cfea13cc4ced637f731a87d0d3989de9 Makefile

Normally I would not need the changes since the engine is not in this rep. But it included this commit:
commit cf7d8ef9cfea13cc4ced637f731a87d0d3989de9
Author: Zack Middleton <zturtleman@gmail.com>
Date:   Mon Mar 24 13:09:49 2014 -0500

    Remove -falign-loops and -falign-jumps from Makefile

    Clang warns and errors because of them on various platforms.

    Based on pull request #43 by @xhairball.
Changes pulled from ioq3 today with
git diff a7317ac0d5d39ddb60364f21c2fd792be617a145 HEAD code/game
Changes pulled today from ioq3 with:
git diff a7317ac0d5d39ddb60364f21c2fd792be617a145 HEAD code/q3_ui
Some changes from ioq3. Taken with:
git diff a7317ac0d5d39ddb60364f21c2fd792be617a145 HEAD code/cgame

Only the comments could be merged automatically but it also included this:
commit 0448f68a13c53efd17a8ef04d4a6b3e01a12bef6
Author: Zack Middleton <zturtleman@gmail.com>
Date:   Thu May 23 00:55:32 2013 -0500

    Fix predicting touching items in CTF and 1FCTF

    In CTF, rail or plasma gun/ammo were not predicted for pickup depending on what team player is on. The rail and plasma values are the same as PW_REDFLAG and PW_BLUEFLAG.
    In 1FCTF, only neutral flag, BFG, and BFG ammo were predicted for pickup. WP_BFG is equal to PW_NEUTRALFLAG.

It had to be manually merged since it semi conflicted with CTF Elimination

Also removed some unused calls noticed by zturtleman. Thanks for that!
Merge branch 'master' of github.com:sago007/gamecode