]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a60bbd 59fd396)
Merge branch 'master' into terencehill/bot_waypoints
authorMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)
# Conflicts:
# .gitlab-ci.yml

1  2 
qcsrc/server/command/cmd.qc patch | diff1 | diff2 | blob | history
xonotic-client.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/command/cmd.qc
Simple merge
diff --cc xonotic-client.cfg
Simple merge