]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/kay_crosshairs'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 15:40:19 +0000 (17:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 15:40:19 +0000 (17:40 +0200)
commit6826abb2eb7c6e777bacf41bc0ab95626272ef69
tree729556870cfc97135d54f56eb2a12ae15eeb43d4
parent70ad864b4575d18a92092aeb6ffc8a6c198a9767
parent0e7968c94ca0247b7708aee816da4778ad1cafcd
Merge remote branch 'origin/fruitiex/kay_crosshairs'