Merge remote-tracking branch 'origin/master' into terencehill/clear_button

[xonotic/xonotic-data.pk3dir.git] / qcsrc / dpdefs / csprogsdefs.qc

diff --git a/qcsrc/dpdefs/csprogsdefs.qc b/qcsrc/dpdefs/csprogsdefs.qc
index c9b9ce9cbc358056fa13b34169ac04c5c015559c..79d33fd3c2167931f75c3150e7d1e6ee9924a967 100644 (file)
--- a/qcsrc/dpdefs/csprogsdefs.qc
+++ b/qcsrc/dpdefs/csprogsdefs.qc
@@ -335,7 +335,7 @@ void(entity e, vector o) setorigin = #2;
 void(entity e, string m) setmodel = #3;
 void(entity e, vector min, vector max) setsize = #4;
 
-void() break = #6;
+void() break_builtin = #6;
 float() random = #7;
 void(entity e, float chan, string samp) sound = #8;
 vector(vector v) normalize = #9;