]> 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: 6faacfc 71339e3)
Merge remote-tracking branch 'origin/Mario/misc_tracker_fixes'
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:51:42 +0000 (17:51 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:51:42 +0000 (17:51 -0400)
1  2 
qcsrc/common/notifications.qh patch | diff1 | diff2 | blob | history

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