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-04-30 00:22:26 +00:00
2010-09-22 21:14:40 +00:00
2010-09-22 21:14:40 +00:00
2010-09-22 21:14:40 +00:00
2010-09-22 21:14:40 +00:00
2010-09-22 21:14:40 +00:00
2010-09-22 20:52:10 +00:00
2010-04-15 18:51:26 +00:00
2010-09-22 21:14:40 +00:00
2011-06-05 14:30:45 +02:00
2010-09-22 21:14:40 +00:00
2011-06-13 14:47:29 +02:00
2010-09-22 21:14:40 +00:00
2010-01-31 21:44:11 +00:00
2010-02-22 21:22:08 +00:00
2010-07-10 10:41:47 +00:00