]> 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: bb15fb9 f038675)
Merge remote branch 'origin/tzork/turrets-csqc'
authorJakob MG <jakob_mg@hotmail.com>
Wed, 22 Jun 2011 18:11:04 +0000 (20:11 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 22 Jun 2011 18:11:04 +0000 (20:11 +0200)
1  2 
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/constants.qh
Simple merge