]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 18:30:25 +0000 (20:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 18:30:25 +0000 (20:30 +0200)
commit3b78fbb1502723de709e1dcf170d4d79797fc259
tree1eb8db81eda8f3fc6bcbd67464589418249ddaec
parent38e0d134b08fbdbd3331c172f40b909b715627b5
parent3a94a854d4d92f72a3ce4b1ff4df6e59db8ca4c4
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'