svn merge -c-4932 .
authorChristoph Sommer <mail@christoph-sommer.de>
Wed, 7 Mar 2007 23:27:32 +0000 (23:27 +0000)
committerChristoph Sommer <mail@christoph-sommer.de>
Wed, 7 Mar 2007 23:27:32 +0000 (23:27 +0000)
commitfcf21b831a16275cee70886492a5037519c6c863
treef0b5056d1c760654e39c914cf01b97f59da9e1e1
parent254d30b5fb7acddb455c2267ba22c9c19b71f715
svn merge -c-4932 .

SVN-Revision: 4934
src/object/player.cpp
src/object/trampoline.cpp