]> 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: 85684a6 ce0f3df)
Merge branch 'maint' (early part before Transifex)
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Aug 2015 23:31:01 +0000 (01:31 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Aug 2015 23:31:01 +0000 (01:31 +0200)
1  2 
qcsrc/common/monsters/sv_monsters.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge