Merge commit 'origin/master' into diabolik/pyriaplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 24 May 2010 21:08:37 +0000 (17:08 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 24 May 2010 21:08:37 +0000 (17:08 -0400)
commit7478ee65e419e5cbd39978693820f451ad3c0754
tree3cd6728a256d4fddd7c36ff544cea4a1b0d087c2
parent9009ba7b774bc9745db93a5a8ee42b2dce9d9d9a
parente4c4af7662d3ec8b3302fe7b5d0fd73fb094d64c
Merge commit 'origin/master' into diabolik/pyriaplayermodel
defaultXonotic.cfg