Frederik Gladhorn e2776b44a0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb		2013-06-12 19:17:07 +02:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-06-12 19:17:07 +02:00
pbuilder_pbx.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00