Merge branch 'master' into terencehill/music_player
authorterencehill <piuntn@gmail.com>
Tue, 30 Dec 2014 23:42:33 +0000 (00:42 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 30 Dec 2014 23:42:33 +0000 (00:42 +0100)
commitc2979f977d8f1f9c20f68447b672bc7fb732a2f5
treefcc41338fcd340f2466a9f7baa42727db93b79ce
parent4d7dd5f59ca155df8b1fed0a779163bb250df93e
parent433c8f23b7a9e35e7910ed79da6f150565c70b7f
Merge branch 'master' into terencehill/music_player
defaultXonotic.cfg