]> 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: 3076f85 2943f92)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Sun, 3 Mar 2013 19:57:57 +0000 (14:57 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 3 Mar 2013 19:57:57 +0000 (14:57 -0500)
1  2 
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history

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