Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
access	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
bearer	Remove BlackBerry PlayBook support.	2015-02-20 14:55:54 +00:00
doc	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
kernel	IPv6 scope IDs are unsigned	2015-03-14 01:15:21 +00:00
socket	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
ssl	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
network.pro	Android: New bearer plugin	2014-07-10 23:09:31 +02:00