]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Thu, 13 Jun 2013 20:45:40 +0000 (22:45 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Thu, 13 Jun 2013 20:45:40 +0000 (22:45 +0200)
commit48837fe02a59a2118276e26aef3ba076590788da
treeb8e5e4eb891d3bc34c4689f2acede8f7efedb672
parent8caa9ad5b75ea402e4bb01a3df8193d30a68d86d
parenteae3784be2283e9cf9ab62405324e7c8e5a14232
Merge branch 'master' into matthiaskrgr/gitignore