]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Wed, 15 Aug 2012 02:44:39 +0000 (04:44 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 15 Aug 2012 02:44:39 +0000 (04:44 +0200)
commit9d395e09c205bc34f81402b6bc95974817bd9953
tree97b2b3e4f293d2d55a9a27878f0a69a69aafd256
parent7e024612ee60433f89ac84f735c6e8e9e880363e
parentc24e714bb5b5ba56b0e5a00d0c98ddf3d4771b52
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

Conflicts:
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/vehicles.qc