]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'samual/seeker_updates' into samual/change_default_balance
authorSamual <samual@xonotic.org>
Mon, 21 Mar 2011 23:22:28 +0000 (19:22 -0400)
committerSamual <samual@xonotic.org>
Mon, 21 Mar 2011 23:22:28 +0000 (19:22 -0400)
commit226ca8b9d112bef5d5080b3dd0310f49064352d6
tree2454a592c083ce8106acaa836e88257b148e6bca
parent4414583c9fef2a11aa92689fd67959d07821c2ba
parent3fbe5da6eae001732b902e3c5247a3668a27f294
Merge branch 'samual/seeker_updates' into samual/change_default_balance
balanceFruitieX.cfg
balanceXonotic.cfg