SVN commit 1242603 by esken:

Resolve conflict

 M  +1 -0      CMakeLists.txt  


--- trunk/KDE/kdemultimedia/kmix/CMakeLists.txt #1242602:1242603
@@ -77,6 +77,7 @@
 kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
 
 target_link_libraries(kdeinit_kmix ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
+#target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} /home/kde/workspace/kdelibs/build/lib/libsolid.so.4.7.0 ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
 
 if (HAVE_LIBASOUND2)
     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})