Philip Falkner 45aeae3273 Merge from trunk (now it should build) ... r581402: Not used. r628276: merge the kinstance-redesign branch r628350: This directory doesn't exist on my computer :) svn path=/branches/work/kwin_composite/; revision=628706		2007-01-30 23:57:40 +00:00
..
kwindecoration	Merge from trunk (now it should build)	2007-01-30 23:57:40 +00:00
kwinoptions	Merge from trunk (now it should build)	2007-01-30 23:57:40 +00:00
kwinrules	Merge from trunk (now it should build)	2007-01-30 23:57:40 +00:00
CMakeLists.txt	Clean up	2006-08-30 08:33:11 +00:00