Frederik Gladhorn c5706f05a8 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9
2013-11-29 16:03:52 +01:00
2013-08-16 17:34:22 +02:00
2013-11-25 20:51:59 +01: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%