Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --cc qcsrc/Makefile
index 69e3105e3afaced874db4b91b4cdca5a933b8e31,75aa33912b21511f013ed3b7539f65655233c2bd..538a44bacc4645cbbb144043966a40523d25b90b
--- 1/qcsrc/Makefile
--- 2/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@@ -3,25 -3,10 +3,25 @@@ PERL ?= per
  QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
  QCC ?= fteqcc
  
- VERSION_MESSAGE = $(shell $(QCC) --version --help)
+ VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
  ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
  # this is gmqcc
 -QCCFLAGS ?= -Werror -Wall -Wno-field-redeclared -Wno-double-declaration -Wno-assign-function-types -Wno-unused-variable -std=fteqcc -O3 -fshort-logic -ftranslatable-strings -flno $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
 +QCCFLAGS ?= \
 +      -std=fteqcc \
 +      -Werror -Wall \
 +      -Wno-field-redeclared \
 +      -Wno-double-declaration \
 +      -Wno-assign-function-types \
 +      -Wno-unused-variable \
 +      -O3 \
 +      -fftepp \
 +      -ftranslatable-strings \
 +      -fadjust-vector-fields \
 +      -fassign-function-types \
 +      -fcorrect-ternary \
 +      -fshort-logic \
 +      -flno \
 +      $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
  else
  # this. is. fteqccccccccccccccccccc!
  QCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-return_only -fno-fastarrays $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)