Merge remote branch 'origin/fruitiex/loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:17:14 +0000 (19:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:17:14 +0000 (19:17 +0200)
commit3175386715806c52de242cbb0ba0fe21b7aa20b3
treeab2fb2aba272bd6077b18f373dacbcf5f0eff59b
parent4917df1ef0f9edb11438d504e5ed1caee5136437
parent720f169bb39f7c8a786ed5f0ea0867d59623d4ef
Merge remote branch 'origin/fruitiex/loadscreen'
defaultXonotic.cfg