]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/mirceakitsune/sniper_crosshair'
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 28 Aug 2011 15:33:45 +0000 (17:33 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 28 Aug 2011 15:33:45 +0000 (17:33 +0200)
commitc8216300d49616ff3124e43af90432868a34a3f2
tree147c87b81bc0324b5a4813fb8510c3878cfd411d
parent817b644f9ce28ed9c2579435280b3840032ce8b6
parent8616417c78650d1256d539ef947fcc4cbc08bdf7
Merge remote branch 'origin/mirceakitsune/sniper_crosshair'