David Faure 656d7a2d99 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
	CMakeLists.txt (version)
	plasma/data/services/plasma-applet-extenderapplet.desktop (deleted in frameworks)
2012-01-23 11:06:24 +01:00
..
2011-11-23 11:32:18 +01:00
2010-10-31 22:21:23 +00:00
2011-04-29 11:17:28 +02:00
2011-07-15 14:09:19 +02:00
2011-05-26 16:02:56 +02:00
2011-07-21 15:18:54 +02:00
2011-05-26 17:22:48 +02:00
2011-04-29 11:17:31 +02:00
2011-04-29 11:17:31 +02:00
2008-11-03 23:08:39 +00:00