Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)
commitb579c6c43694c474ba90a44af2806be54f0faa10
tree98d80631ea79e65379290386f975972fc21ba73c
parent40500b7ee820b61abca907bdf16c37af92107886
parent5048c320c35091603feb7429ffd2d0966fcac2c7
Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow