]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/fruitiex/crosshairupdates'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:21:47 +0000 (17:21 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:21:47 +0000 (17:21 +0200)
commitff27bb747d570e100726964a5fb3b6eaca8f0738
treeb1a9496d83ead6338a94e9624c19c91b6d5f3a8f
parent8e6ed4d080e01f15ef5a0363f9353da5f9bcf6f1
parentb854d2cbd6a1b1acee46a08c3b0fc8bff7ac1daf
Merge remote branch 'refs/remotes/origin/fruitiex/crosshairupdates'