2d1b06329254: Merge.
Asher Baker <asherkin@limetech.org> - Sun, 27 May 2012 02:16:48 +0100 - rev 784
Merge.

ba8cd35102b1: Added META_NO_HL2SDK define to stop MM:S headers using the HL2SDK (bug 5079, r=dvander).
Asher Baker <asherkin@gmail.com> - Sun, 27 May 2012 02:16:08 +0100 - rev 783
Added META_NO_HL2SDK define to stop MM:S headers using the HL2SDK (bug 5079, r=dvander).

6c999e76296d: Fixed passage of non-literals as error and warning format strings (r=DS).
Nicholas Hastings <skamonkey@gmail.com> - Sat, 26 May 2012 17:46:02 -0400 - rev 782
Fixed passage of non-literals as error and warning format strings (r=DS).

adc721127235: Triggering build.
Nicholas Hastings <skamonkey@gmail.com> - Sat, 26 May 2012 17:36:58 -0400 - rev 781
Triggering build.

35f2a207badf: Added support for CS: Global Offensive (bug 5228, r=DS).
Nicholas Hastings <skamonkey@gmail.com> - Sat, 26 May 2012 17:07:26 -0400 - rev 780
Added support for CS: Global Offensive (bug 5228, r=DS).

87fe1357aa5f: Don't add -Wno-delete-non-virtual-dtor for gcc < 4.7. (bug 5205, r=DS).
Nicholas Hastings <skamonkey@gmail.com> - Sat, 26 May 2012 15:46:15 -0400 - rev 779
Don't add -Wno-delete-non-virtual-dtor for gcc < 4.7. (bug 5205, r=DS).

faee01f77160: Remove std string include from core and core-legacy headers (bug 5304, r=DS).
Nicholas Hastings <skamonkey@gmail.com> - Sat, 26 May 2012 15:43:00 -0400 - rev 778
Remove std string include from core and core-legacy headers (bug 5304, r=DS).

62e002cdecdb: Only add -Wno-delete-non-virtual-dtor for gcc >= 4.3 and clang >= 3.0.
Scott Ehlert <ds@alliedmods.net> - Wed, 21 Mar 2012 21:02:15 -0500 - rev 777
Only add -Wno-delete-non-virtual-dtor for gcc >= 4.3 and clang >= 3.0.

9a914b214cef: Triggering a build.
Scott Ehlert <ds@alliedmods.net> - Wed, 21 Mar 2012 19:27:58 -0500 - rev 776
Triggering a build.

8d570c46381b: Triggering build.
Scott Ehlert <ds@alliedmods.net> - Wed, 21 Mar 2012 07:38:05 -0500 - rev 775
Triggering build.