Marco Martin 33e9192346 Merge branch 'libplasma2' into frameworks
Conflicts:
	plasma/CMakeLists.txt
	plasma/popupapplet.cpp
2011-08-12 11:45:49 +02: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