mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 20:00:13 +02:00
Code Issues Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Leo Franchi
2011-08-05 15:39:04 -04:00
parent b15d3162de
commit aeb949aa23
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/CMakeLists.txt
View File

@@ -443,13 +443,8 @@ IF( APPLE )
utils/tomahawkutils_mac.mm ) utils/tomahawkutils_mac.mm )
SET( libHeaders ${libHeaders} SET( libHeaders ${libHeaders}
<<<<<<< HEAD
infosystem/infoplugins/mac/adium.h infosystem/infoplugins/mac/adium.h
infosystem/infoplugins/mac/adiumplugin.h ) infosystem/infoplugins/mac/adiumplugin.h )
=======
infosystem/infoplugins/mac/adiumplugin.h
widgets/maclineedit.h )
>>>>>>> master
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}