]> 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: 2077350 2fa15cd)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Wed, 20 Feb 2013 20:19:42 +0000 (15:19 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 20 Feb 2013 20:19:42 +0000 (15:19 -0500)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history

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