Merge branch '1.7-dev' of https://github.com/alliedmodders/sourcemod into 1.7-dev.

This commit is contained in:
Nicholas Hastings 2015-05-30 08:06:56 -04:00
commit 255e2ef6f0

View File

@ -105,8 +105,8 @@ sm_timeleft_interval 0
// 1 (Enabled) // 1 (Enabled)
// -- // --
// Requires: basetriggers.smx // Requires: basetriggers.smx
// Default: 1 // Default: 0
sm_trigger_show 1 sm_trigger_show 0
// Specifies whether or not to display vote progress to clients in the // Specifies whether or not to display vote progress to clients in the
// "hint" box (near the bottom of the screen in most games). // "hint" box (near the bottom of the screen in most games).