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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / progs.src

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 1bae6f980ce9cd9d232dd6f4cdf52f9f7f339fdc..5c999895bd019a1c3a70b4d11df6d197df9741ee 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -123,5 +123,3 @@ tturrets.qc
 
 player_skeleton.qc
 ../common/animdecide.qc
 
 player_skeleton.qc
 ../common/animdecide.qc

-
-../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail