]> 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: 3b45384 c927fe4)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Thu, 27 Dec 2012 14:10:05 +0000 (09:10 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 27 Dec 2012 14:10:05 +0000 (09:10 -0500)
Conflicts:
qcsrc/server/g_damage.qc

1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/cl_client.qc
Simple merge