]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/crosshairs'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:02:46 +0000 (19:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:02:46 +0000 (19:02 +0200)
commitd43d6555e165f78d86f5a47ebdf6be08c29c70df
tree7d16a5979a03a31bda42cab906950d8341f342c5
parent6d9605e3a54e5a18274fb3b642677a80865be9a6
parent012149ce2f2b513dedc97c9e722409d2d1fd4f8d
Merge remote branch 'origin/fruitiex/crosshairs'
defaultXonotic.cfg