Merge branch 'master' into grouping
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 9 Jul 2010 07:12:34 +0000 (10:12 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 9 Jul 2010 07:12:34 +0000 (10:12 +0300)
1  2 
src/map/baselocationitem.h

Simple merge