]> 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: 00f75fd 9851767)
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Sun, 8 Apr 2012 17:03:30 +0000 (19:03 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 8 Apr 2012 17:03:30 +0000 (19:03 +0200)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history

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