]> 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: b26329a 48b083d)
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Mon, 16 Jan 2012 00:57:14 +0000 (19:57 -0500)
committerSamual <samual@xonotic.org>
Mon, 16 Jan 2012 00:57:14 +0000 (19:57 -0500)
1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge