SVN commit 6917 by xzhayon: - Mark some conflicts easily found with my new script. :) M +2 -0 astro/marble/Makefile M +1 -1 devel/kdesdk4/Makefile M +2 -0 x11-themes/kdeartwork4/Makefile M +2 -0 x11/kdebase4-runtime/Makefile M +1 -1 x11/kdelibs4/Makefile