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-06-21 13:17:45 +00:00
2011-05-31 00:03:39 +02:00
2011-05-31 01:00:35 +02:00
2010-06-09 01:16:45 +00:00
2010-10-12 19:33:15 +00:00
2010-09-27 18:16:27 +00:00
2010-01-18 18:24:57 +00:00
2010-02-22 11:21:30 +00:00
2010-07-24 00:52:37 +00:00
2011-05-26 23:13:44 +02:00
2011-05-26 23:13:44 +02:00
2011-04-29 11:17:30 +02:00
2009-12-01 00:58:28 +00:00
2009-12-01 00:58:28 +00:00
2010-11-08 17:25:12 +00:00
2011-06-09 12:46:25 +02:00
2011-06-09 12:46:25 +02:00