Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:17:47 +0000 (10:17 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:19:32 +0000 (10:19 +0100)
Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25

1  2 
src/quick/items/qquickwindow.cpp

Simple merge