Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
	qcsrc/common/util.qh

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

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

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
index 78c9baa6edade795bd07237d3a4e56122c525265,a8dd88c2f05b7b7490bd989a8015969533dc3106..dc8b8708b616a3307384301b9d71584fd24e4c28
--- 1/qcsrc/common/util.qh
--- 2/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -20,15 -20,6 +20,11 @@@ void wordwrap_sprint(string s, float l)
  #endif
  void wordwrap_cb(string s, float l, void(string) callback)
  
- float GameCommand_Generic(string cmd);
- // returns TRUE if handled, FALSE otherwise
- // tokenizes its input!
- 
 +#ifndef SVQC
 +string draw_currentSkin;
 +string draw_UseSkinFor(string pic);
 +#endif
 +
  // iterative depth-first search, with fields that go "up", "down left" and "right" in a tree
  // for each element, funcPre is called first, then funcPre and funcPost for all its children, and funcPost last
  void depthfirst(entity start, .entity up, .entity downleft, .entity right, void(entity, entity) funcPre, void(entity, entity) funcPost, entity pass);