Merge remote-tracking branch 'origin/master into samual/weapons

Conflicts:
	qcsrc/common/util.qh

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

diff --cc qcsrc/common/util.qh
index ae378ddfd55cfc1420385f4fd88ef7f5319c3a41,503aa2d2a0f9452fa81232493caa94e95383477b..570a41e0107b3434a00949e568ea00ce47bc2d5b
--- 1/qcsrc/common/util.qh
--- 2/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -446,4 -442,6 +446,8 @@@ float Mod_Q1BSP_SuperContentsFromNative
  float Mod_Q1BSP_NativeContentsFromSuperContents(float supercontents);
  #endif
  
+ // Quadratic splines (bezier)
+ vector bezier_quadratic_getpoint(vector a, vector p, vector b, float t);
+ vector bezier_quadratic_getderivative(vector a, vector p, vector b, float t);
++
 +#define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))