Merge commit 'origin/locationlistview' into friendlist_filtering_text_field
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 12 Aug 2010 10:26:43 +0000 (13:26 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 12 Aug 2010 10:26:43 +0000 (13:26 +0300)
commit183a7e8e8a18dcc1d9cd72a17a2216a689e0d072
tree04f67ef62759b12f46f5f6a8a05538be22fc0241
parent9ccff5a8da320cff9a24f19137ccbbf7be1d7e47
parent737754780392f5b6b992f613fd088b41c0af5b99
Merge commit 'origin/locationlistview' into friendlist_filtering_text_field

Conflicts:
tests/tests.pro