Merge remote branch 'origin/fruitiex/loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)
commit5ccb0ec591b75a8af431dcc5c9d590d1a98054a6
tree2d7427e37fef1a66fa2789bbb53a2051133dc313
parent49aab18fe6f03a9eaae8c0cbd385450bc4171f34
parent05b75beee2f391ac370945b0159036fe69851778
Merge remote branch 'origin/fruitiex/loadscreen'
defaultXonotic.cfg