Frederik Gladhorn 677aac0e92 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/plugins/blackberry/camera/bbcamerasession.cpp

Change-Id: I7c86e10140ab86fd2a07e2f034dec38ae9112559
2013-10-14 14:35:38 +02:00
2013-08-16 17:34:22 +02:00
2013-09-25 00:37:26 +02:00
2012-09-03 19:53:28 +02:00
Description
No description provided
17 MiB
Languages
C++ 90.5%
Objective-C++ 5.8%
QMake 1%
Objective-C 0.9%
QML 0.5%
Other 1%