]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2135a7a 76d3feb)
Merge branch 'master' into samual/serverlist
authorRudolf Polzer <divverent@xonotic.org>
Sun, 13 Oct 2013 22:50:32 +0000 (00:50 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 13 Oct 2013 22:50:32 +0000 (00:50 +0200)
1  2 
qcsrc/dpdefs/menudefs.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/menu.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/dpdefs/menudefs.qc
Simple merge
diff --cc qcsrc/menu/menu.qc
Simple merge