]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: d1ae740)
Merge remote branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Wed, 1 Jun 2011 16:40:20 +0000 (18:40 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 1 Jun 2011 16:40:20 +0000 (18:40 +0200)
Conflicts:
qcsrc/client/View.qc


No differences found