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

Merge branch 'master' into jreen-tpqt4-comp

Browse Source 
Conflicts:
	CMakeLists.txt
	src/tomahawkapp.cpp
This commit is contained in:
Dominik Schmidt
2011-04-06 06:58:33 +02:00
parent c1385761b6 b6d12701e7
commit 60142eb92d
121 changed files with 5936 additions and 1997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
SET( TOMAHAWK_APPLICATION_NAME "Tomahawk" )
SET( TOMAHAWK_VERSION "0.0.2" )
SET( TOMAHAWK_VERSION "0.0.3" )
# set paths