c8bdc3e6a93f: Added new player condition (TFCond_CritCola) to tf2.inc. (bug 4447, r=fyren)
Nicholas Hastings <skamonkey@gmail.com> - Sun, 06 Jun 2010 20:51:35 -0400 - rev 3035
Added new player condition (TFCond_CritCola) to tf2.inc. (bug 4447, r=fyren)

b7efdf75360f: Merge
Matt Woodrow <matt.woodrow@gmail.com> - Mon, 07 Jun 2010 10:33:47 +1200 - rev 3034
Merge

dfab18764ff6: Fixed clientprefs deleting cookies twice in rare cases (bug 4412, r=Fyren)
Matt Woodrow <matt.woodrow@gmail.com> - Mon, 07 Jun 2010 10:30:33 +1200 - rev 3033
Fixed clientprefs deleting cookies twice in rare cases (bug 4412, r=Fyren)

ee7a5629ff68: Fixed OnClientConnected forward not firing for bots (bug 4443, r=fyren)
Nicholas Hastings <skamonkey@gmail.com> - Sun, 06 Jun 2010 17:53:38 -0400 - rev 3032
Fixed OnClientConnected forward not firing for bots (bug 4443, r=fyren)

e45ed10cb5ba: Fix sdktools voice memory corruption (bug 4415, r=dvander)
Fyren <fyrenmoo@gmail.com> - Sat, 05 Jun 2010 23:15:29 -0700 - rev 3031
Fix sdktools voice memory corruption (bug 4415, r=dvander)

b932396e9535: Added gamedata for CS:S Beta (ep2v) on Mac OS X. (bug 4399, r=dvander).
Scott Ehlert <ds@alliedmods.net> - Fri, 04 Jun 2010 17:14:52 -0500 - rev 3030
Added gamedata for CS:S Beta (ep2v) on Mac OS X. (bug 4399, r=dvander).

47b76c8f0d26: Updated Obsidian Conflict gamedata (bug 4439, r=fyren)
Nicholas Hastings <skamonkey@gmail.com> - Wed, 02 Jun 2010 07:47:00 -0400 - rev 3029
Updated Obsidian Conflict gamedata (bug 4439, r=fyren)

5ff200ebefc5: Fixed tf2.inc incorrectly attempting to load tf2 ext on all games (bug 4197, r=fyren)
Nicholas Hastings <skamonkey@gmail.com> - Mon, 31 May 2010 16:31:10 -0400 - rev 3028
Fixed tf2.inc incorrectly attempting to load tf2 ext on all games (bug 4197, r=fyren)

0f90dd9754ca: Fixed various areas where code was being compiled for Linux only, but should actually be used on OS X too (bug 4392, r=dvander).
Scott Ehlert <ds@alliedmods.net> - Sat, 29 May 2010 18:11:47 -0400 - rev 3027
Fixed various areas where code was being compiled for Linux only, but should actually be used on OS X too (bug 4392, r=dvander).

00ff635525fc: Merge.
Scott Ehlert <ds@alliedmods.net> - Sat, 29 May 2010 00:38:08 -0500 - rev 3026
Merge.