]> 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: 69a88bf d8d184e)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Mon, 28 Jan 2013 22:43:46 +0000 (17:43 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 28 Jan 2013 22:43:46 +0000 (17:43 -0500)
1  2 
qcsrc/Makefile patch | diff1 | diff2 | blob | history

diff --cc qcsrc/Makefile
Simple merge