From: Samual <samual@xonotic.org>
Date: Sat, 7 Jan 2012 18:18:00 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into mirceakitsune/preview_images
X-Git-Tag: xonotic-v0.6.0~188^2~16^2~3^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7ee5fd9f465455a5691abba80a7e83a1ab5b2d8;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/common/util.qh
---

b7ee5fd9f465455a5691abba80a7e83a1ab5b2d8
diff --cc qcsrc/common/util.qh
index 78c9baa6e,a8dd88c2f..dc8b8708b
--- a/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)
  
 +#ifndef SVQC
 +string draw_currentSkin;
 +string draw_UseSkinFor(string pic);
 +#endif
 +
- float GameCommand_Generic(string cmd);
- // returns TRUE if handled, FALSE otherwise
- // tokenizes its input!
- 
  // 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);