]> 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: 81dd21d 3e496a3)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Tue, 26 Feb 2013 16:26:16 +0000 (11:26 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 26 Feb 2013 16:26:16 +0000 (11:26 -0500)
1  2 
commands.cfg patch | diff1 | diff2 | blob | history

diff --cc commands.cfg
Simple merge