Merge branch 'master' into terencehill/misc_bugfixes
authorterencehill <piuntn@gmail.com>
Sun, 4 Jul 2010 23:08:29 +0000 (01:08 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 4 Jul 2010 23:08:29 +0000 (01:08 +0200)
commit84f2a6cddce774e25f31050e71992c00a755e171
tree07c79e685b06a080721ddab8d0ad5bab6e710438
parente1bea92ac918ca77e842a93beb8acb6ebdd63f02
parentb746cdda7924959dbf1b6790cfd7bf6b84eaaeb8
Merge branch 'master' into terencehill/misc_bugfixes
defaultXonotic.cfg