Merge branch 'master' into terencehill/quickmenu

# Conflicts:
#	qcsrc/client/command/cl_cmd.qc

diff --cc qcsrc/client/command/cl_cmd.qc
index c3b601984b39d58dd7c212061b07157c532ae0df,34e891cca23b6a617927e6d6c354aceb92f59700..2d6093868cc1ea496e5822880e0c69f5900c4f00
--- 1/qcsrc/client/command/cl_cmd.qc
--- 2/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@@ -315,18 -306,15 +315,18 @@@ void LocalCommand_hud(int request, int 
                }
  
                default:
-                       print("Incorrect parameters for ^2hud^7\n");
+                       LOG_INFO("Incorrect parameters for ^2hud^7\n");
                case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
-                       print("  Where 'action' is the command to complete,\n");
-                       print("  'configname' is the name to save to for \"save\" action,\n");
-                       print("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
-                       print("  and 'layout' is how to organize the scoreboard columns for the set action.\n");
-                       print("  quickmenu [[default | file | \"\"] submenu]\n");
-                       print("    Called without options (or with "") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n");
-                       print("    Submenu option allows to open quickmenu directly in a submenu, it requires to specify 'default', 'file' or '\"\"' option.\n");
-                       print("  Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
+                       LOG_INFO("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
+                       LOG_INFO("  Where 'action' is the command to complete,\n");
+                       LOG_INFO("  'configname' is the name to save to for \"save\" action,\n");
+                       LOG_INFO("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
+                       LOG_INFO("  and 'layout' is how to organize the scoreboard columns for the set action.\n");
++                      LOG_INFO("  quickmenu [[default | file | \"\"] submenu]\n");
++                      LOG_INFO("    Called without options (or with "") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n");
++                      LOG_INFO("    Submenu option allows to open quickmenu directly in a submenu, it requires to specify 'default', 'file' or '\"\"' option.\n");
+                       LOG_INFO("  Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
                        return;
                }
        }

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/hud_config.qc
Simple merge

diff --cc qcsrc/client/main.qc
index 7dc9466a04a3c1fb84cead012130ec6d37f6e1ae,6f40c3970d5b902156abc73521b10dc62e091dd2..a5085e893da413c6db62620736aabb7fef9d6fec
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -87,10 -87,10 +87,10 @@@ string forcefog
  void ConsoleCommand_macro_init();
  void CSQC_Init(void)
  {
 -      prvm_language = cvar_string("prvm_language");
 +      prvm_language = strzone(cvar_string("prvm_language"));
  
  #ifdef WATERMARK
-       dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
+       LOG_TRACEF("^4CSQC Build information: ^1%s\n", WATERMARK);
  #endif
  
        int i;

diff --cc qcsrc/client/scoreboard.qc
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge

diff --cc qcsrc/server/command/cmd.qc
Simple merge