]> 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: 2dccec3 9ac8d4b)
Merge remote branch 'origin/master'
authorSamual <samual@xonotic.org>
Tue, 10 Jan 2012 17:48:45 +0000 (12:48 -0500)
committerSamual <samual@xonotic.org>
Tue, 10 Jan 2012 17:48:45 +0000 (12:48 -0500)
1  2 
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/csqcmodel_hooks.qc
Simple merge