From c48a9b44a3c844edf37f93fd133834bb493acf01 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Thu, 8 Jan 2015 23:56:05 +0000 Subject: [PATCH 1/5] Scrollback link + friends listen along clarification. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 282a5e949..09f083ea5 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ ## WHAT TOMAHAWK IS -Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along to them. Let the music play! +Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along with them. Let the music play! ![Tomahawk Screenshot](/data/screenshots/tomahawk-screenshot.png?raw=true) ## HOW TOMAHAWK WORKS -Tomahawk is basically a **music metadata player**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist Tomahawk will find the right source, for the right user at the right time. This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible. +Tomahawk is basically a **music metadata player**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist Tomahawk will find the right source, for the right user at the right time. This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible. ## MUSIC SOURCES @@ -123,7 +123,7 @@ Third party libraries that we ship with our source: ## GET HELP * [Support & Feedback](https://tomahawk.uservoice.com) -* Chat with Us (IRC): #tomahawk (on Freenode) +* Chat with us in IRC: **#tomahawk** on Freenode, and [Scrollback.io](https://scrollback.io/tomahawk) * [Twitter](https://twitter.com/tomahawk) * [Facebook](https://facebook.com/tomahawkplayer) * [Developer API documentation](http://dev.tomahawk-player.org/api/classes.html) From 3870ea7d29978deeb5dc1d93936fb0568979de41 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Fri, 9 Jan 2015 00:17:11 +0000 Subject: [PATCH 2/5] Minor formatting changes --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 09f083ea5..ae90c7ec2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ Tomahawk is a free multi-source and cross-platform music player. An application ## HOW TOMAHAWK WORKS -Tomahawk is basically a **music metadata player**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist Tomahawk will find the right source, for the right user at the right time. This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible. +Tomahawk is basically a **player for music metadata**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. +In short, given the name of a song and artist, Tomahawk will find the right source, for the right user at the right time. This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible. ## MUSIC SOURCES @@ -51,7 +52,7 @@ You can download one of our nightly or stable builds: | *BUILD* | MAC / OSX | WINDOWS | LINUX | |:-------:|:---------:|:-------:|:-----:| -|**NIGHTLY** | [**latest**](http://download.tomahawk-player.org/nightly/mac/Tomahawk-latest.dmg) | [**latest**](http://download.tomahawk-player.org/nightly/windows/tomahawk-latest.exe) | [**latest**] (https://launchpad.net/~tomahawk/+archive/ubuntu/nightly) (Ubuntu) | +|**NIGHTLY** | [**latest**](http://download.tomahawk-player.org/nightly/mac/Tomahawk-latest.dmg) | [**latest**](http://download.tomahawk-player.org/nightly/windows/tomahawk-latest.exe) | [**latest**](https://launchpad.net/~tomahawk/+archive/ubuntu/nightly) (Ubuntu) | |**STABLE** | [**0.8**](http://download.tomahawk-player.org/Tomahawk-0.8.0.dmg) | [**0.8**](http://download.tomahawk-player.org/tomahawk-0.8.0.exe) | [**0.8**](http://www.tomahawk-player.org/#page-about) (various distros) | ## BUILD TOMAHAWK @@ -110,15 +111,15 @@ Third party libraries that we ship with our source: * [MiniUPnP 1.6](http://miniupnp.free.fr/) * [Qocoa](https://github.com/mikemcquaid/Qocoa/) * [libqnetwm](https://code.google.com/p/libqnetwm/) -* [libqxt](http://libqxt.org/) (QxtWeb module) +* [libqxt](http://libqxt.org/) (QxtWeb module) * [SPMediaKeyTap](https://github.com/nevyn/SPMediaKeyTap/) * [kdSingleApplicationGuard](http://www.kdab.com/) ## SUPPORT TOMAHAWK -* [Bug Tracker & Issues](https://bugs.tomahawk-player.org/secure/Dashboard.jspa) +* [Bug / Issue Tracker](https://bugs.tomahawk-player.org/secure/Dashboard.jspa) * [Translations](https://www.transifex.com/projects/p/tomahawk/) -* [Donate](https://flattr.com/thing/169312/Tomahawk) +* [Donations](https://flattr.com/thing/169312/Tomahawk) ## GET HELP @@ -126,7 +127,7 @@ Third party libraries that we ship with our source: * Chat with us in IRC: **#tomahawk** on Freenode, and [Scrollback.io](https://scrollback.io/tomahawk) * [Twitter](https://twitter.com/tomahawk) * [Facebook](https://facebook.com/tomahawkplayer) -* [Developer API documentation](http://dev.tomahawk-player.org/api/classes.html) +* [Developer API Documentation](http://dev.tomahawk-player.org/api/classes.html) ## SCREENSHOTS From c12f17810f066cb4ad43dab0c6f24d4725a5965c Mon Sep 17 00:00:00 2001 From: Will Stott Date: Fri, 9 Jan 2015 00:17:25 +0000 Subject: [PATCH 3/5] Formatting changes --- README.md | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index ae90c7ec2..5c7eb438c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# TOMAHAWK - -## WHAT TOMAHAWK IS +# WHAT TOMAHAWK IS Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along with them. Let the music play! @@ -65,21 +63,10 @@ You can download one of our nightly or stable builds: ### Detailed Build Instructions -**LINUX** - -* [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) -* [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) -* [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) -* [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) -* [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) - -**MAC** - -* [OS X](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle) - -**WINDOWS** - -* [Windows](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary) +| Linux: | [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) **-** [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) **-** [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) **-** [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) **-** [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) +|-:| +| **Windows**: |[**Windows**](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary) +| **Mac**: | [**OS X**](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle) | ### Dependencies @@ -155,4 +142,4 @@ PLUG-INS / RESOLVER SETTINGS ![Settings](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998587408_prefs.jpg) -**Enjoy!** +##Enjoy! From b13245e965fb0d2401721cfa2de1a44b52981115 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Fri, 9 Jan 2015 00:21:51 +0000 Subject: [PATCH 4/5] Attempted table fix. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5c7eb438c..62a1bb383 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,9 @@ You can download one of our nightly or stable builds: ### Detailed Build Instructions -| Linux: | [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) **-** [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) **-** [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) **-** [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) **-** [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) -|-:| -| **Windows**: |[**Windows**](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary) +| Linux: | [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) **-** [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) **-** [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) **-** [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) **-** [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) | +|-:|:-| +| **Windows**: | [**Windows**](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary) | | **Mac**: | [**OS X**](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle) | ### Dependencies From 92d1fc2b370e42b117b22265aa5073822b35b7e2 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Fri, 9 Jan 2015 00:23:26 +0000 Subject: [PATCH 5/5] 3rd time lucky --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62a1bb383..7ae3064a5 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,8 @@ You can download one of our nightly or stable builds: ### Detailed Build Instructions -| Linux: | [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) **-** [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) **-** [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) **-** [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) **-** [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) | -|-:|:-| +| Linux: | [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) **-** [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) **-** [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) **-** [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) **-** [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) | +|------:|:------| | **Windows**: | [**Windows**](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary) | | **Mac**: | [**OS X**](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle) |