Frederik Gladhorn 733ace5a7a Merge remote-tracking branch 'origin/release' into stable ... Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5		2013-12-05 17:42:33 +01:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/release' into stable	2013-12-05 17:42:33 +01:00
pbuilder_pbx.h	Merge remote-tracking branch 'origin/stable' into dev	2013-09-16 14:52:40 +02:00