From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sun, 8 Feb 2015 12:06:36 +0000 (+0100)
Subject: Merge branch 'master' into matthiaskrgr/screenshotcmd
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f8ca9cd9fa138061ca5112ca66c3d5fbddf1a03;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into matthiaskrgr/screenshotcmd
---

4f8ca9cd9fa138061ca5112ca66c3d5fbddf1a03
diff --cc commands.cfg
index 4ece57f84,20f957029..26bd3be7c
--- a/commands.cfg
+++ b/commands.cfg
@@@ -123,7 -123,7 +123,8 @@@ alias hud                  "qc_cmd_c
  alias localprint           "qc_cmd_cl     localprint           ${* ?}" // Create your own centerprint sent to yourself
  //alias mv_download        "qc_cmd_cl     mv_download          ${* ?}" // Retrieve mapshot picture from the server
  alias sendcvar             "qc_cmd_cl     sendcvar             ${* ?}" // Send a cvar to the server (like weaponpriority)
 +alias plainscreenshot      "menu_watermark \"\" ; cl_hidewaypoints 1 ; viewsize 120 ; settemp crosshair 0 ; screenshot ; settemp_restore crosshair ; viewsize 100 ; cl_hidewaypoints 0 ; menu_watermark"
+ alias exit                 "quit"
  
  // other aliases for local commands
  alias hud_configure "qc_cmd_cl hud configure"