]> 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: cddfb67 e6eb6e7)
Merge branch 'master' into terencehill/start_ammo
authorterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/miscfunctions.qc
Simple merge