]> 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: 4033ba8 e47137c)
Merge remote branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Thu, 9 Jun 2011 17:49:10 +0000 (19:49 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 9 Jun 2011 17:49:10 +0000 (19:49 +0200)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

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