]> 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: dd56dd9 e1d927c)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 28 Oct 2011 19:29:54 +0000 (21:29 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 28 Oct 2011 19:29:54 +0000 (21:29 +0200)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history

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