Merge branch 'fixesfor4.7' into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Mon, 13 Sep 2010 14:05:08 +0000 (16:05 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Mon, 13 Sep 2010 14:05:08 +0000 (16:05 +0200)
commit6cd8a6001fe87107d32524c6115d37b620d3e108
treedb8c882db3bf9dc359f39a6db514959efd5a1123
parente98161b0062169b533eb2e11567ba28165a1141c
parentdfb50fd81e3dfb721cd60635c781125dbe42bfb1
Merge branch 'fixesfor4.7' into 4.7

Conflicts:
examples/tutorials/modelview/3_changingmodel/mymodel.h
examples/tutorials/modelview/3_changingmodel/mymodel.h