Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Jan 2013 10:33:17 +0000 (11:33 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Jan 2013 10:33:58 +0000 (11:33 +0100)
commit1b5f9bec03901519db3694d1b51fa7989ade1f25
tree2b7d539e8f631112e77ae5e2e5867f8ada1febb1
parentbfd73eaba3000861037d03787f87d1f4dafefea8
parentd4f4ee4e033a62858aaf4f29970bc404d9b4c009
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Idcaa9b0c63aca5ba11ee3fa2da456178655a1ae3
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/xcb/qxcbconnection.cpp