Merge branch 'kinetic'
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
commit6d364bca012ab0d2848089377fc3a192bdfacc51
tree82b59c66376ca0936b539ab30926463d65133635
parent3bd30c8a74dd3fe17bed03b3eff1dfdc880619cf
parent9c0c32eaebd36b392612d6de87771b691199c565
Merge branch 'kinetic'
src/map/mapview.cpp
src/map/mapview.h