]> 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: fbec753 0732a09)
Merge remote-tracking branch 'origin/master' into terencehill/menu_focus_stuff
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:11:53 +0000 (20:11 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:11:53 +0000 (20:11 -0400)
1  2 
qcsrc/menu/item/inputcontainer.c patch | diff1 | diff2 | blob | history
qcsrc/menu/item/nexposee.c patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/item/inputcontainer.c
Simple merge
diff --cc qcsrc/menu/item/nexposee.c
Simple merge