]> 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: 5efd9a9 eb40684)
Merge branch 'master' into TimePath/effectinfo
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 06:11:23 +0000 (16:11 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 06:11:23 +0000 (16:11 +1000)
1  2 
qcsrc/client/progs.inc patch | diff1 | diff2 | blob | history
qcsrc/server/progs.inc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/progs.inc
Simple merge
diff --cc qcsrc/server/progs.inc
Simple merge