]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de62828 4181392)
Merge branch 'master' into Mario/bullet_trails Mario/bullet_trails
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 07:37:18 +0000 (17:37 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 07:37:18 +0000 (17:37 +1000)
1  2 
effectinfo.txt patch | diff1 | diff2 | blob | history
qcsrc/common/effects/effectinfo.inc patch | diff1 | diff2 | blob | history

diff --cc effectinfo.txt
Simple merge
diff --cc qcsrc/common/effects/effectinfo.inc
Simple merge