Merge remote branch 'origin/master' into diabolik/newanims
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 06:09:46 +0000 (02:09 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 06:09:46 +0000 (02:09 -0400)
commit277a2eeaa5b955419d958e347c11ad12480a67cc
treefc52791c2a02337156f3d4d5cae23bf4f27432ec
parent02ed6b0208c13d9f349d22a6c6c241f809858ccc
parentc96303a4cf08c3a73d9f111f81cb915bc06ae510
Merge remote branch 'origin/master' into diabolik/newanims
defaultXonotic.cfg