Aaron Seigo 05834d8144 Merge remote-tracking branch 'origin/master' into libplasma2
Conflicts:
	plasma/CMakeLists.txt
	plasma/abstractrunner.h
	plasma/animator.h
	plasma/glapplet.h
	plasma/package.h
	plasma/packagemetadata.h
	plasma/packagestructure.h
	plasma/tooltipcontent.cpp
	plasma/tooltipcontent.h
	plasma/wallpaper.h
2011-07-11 21:56:41 +02:00
..
2010-10-22 16:55:46 +00:00
2011-06-13 14:47:29 +02:00
2011-06-13 14:47:29 +02:00
2010-07-16 17:04:45 +00:00
2010-10-22 16:55:46 +00:00
2011-06-13 14:47:29 +02:00
2010-10-22 16:55:46 +00:00
2011-06-13 14:47:29 +02:00
2011-04-28 10:54:23 +02:00
2011-06-09 12:46:25 +02:00
2011-06-13 14:47:29 +02:00
2011-06-20 17:53:20 +02:00
2008-11-07 18:04:32 +00:00
2011-06-21 01:24:54 +05:30
2011-06-21 01:24:54 +05:30
2010-10-22 16:55:46 +00:00
2010-12-11 10:53:28 +00:00
2011-05-28 00:39:59 +02:00
2009-11-19 19:05:50 +00:00
2009-09-21 13:57:32 +00:00
2010-03-09 19:59:34 +00:00
2011-06-13 14:47:29 +02:00
2011-06-13 14:47:29 +02:00
2011-06-13 14:47:29 +02:00
2010-10-22 16:55:46 +00:00
2011-06-13 14:47:29 +02:00
2011-06-13 14:47:29 +02:00
2011-07-07 15:32:04 +02:00
2011-07-07 15:32:04 +02:00
2010-08-20 18:19:11 +00:00
2009-09-13 17:17:02 +00:00