]> 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: 0800012 c464292)
Merge remote-tracking branch 'origin/master' into terencehill/clear_button
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:24:09 +0000 (20:24 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:24:09 +0000 (20:24 -0400)
1  2 
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/inputbox.c patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/xonotic/inputbox.c
Simple merge