Merge branch 'master' into harmattan harmattan
authorPhilip Lorenz <lorenzph@gmail.com>
Sat, 2 Jun 2012 11:24:02 +0000 (13:24 +0200)
committerPhilip Lorenz <lorenzph@gmail.com>
Sat, 2 Jun 2012 11:24:02 +0000 (13:24 +0200)
commitddf1611fc6511b4d7ecabb19e2c9383088c931e0
tree7f7c8314e11150a04d0c848fa930f0bab6b4f9bd
parent9adfb51d86e26b059d6453ce1deed6436f825bbb
parent39fe586ca93562bf3eae17c8e2287db5d65b6477
Merge branch 'master' into harmattan
src/object/bonus_block.cpp
src/object/player.cpp
src/worldmap/tux.cpp