Frederik Gladhorn 6aa09bbce5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I541bd3069df3ab54c7942d5f4a9e155e3b6566a0		2014-02-18 14:19:36 +01:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2014-02-18 14:19:36 +01:00
bearer	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
socket	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
ssl	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2014-01-21 17:57:54 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00