Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity
5,840 Commits 23 Branches 538 Tags 240 MiB
Commit Graph

48 Commits

Author SHA1 Message Date
John Maguire 2e3cd61c66 Bump 1.2 release version 
(cherry picked from commit 22e422296a)
 2014-05-10 18:26:51 +10:00
John Maguire 6fb4b8e97d Merge branch 'release-1.2' 
Conflicts:
	cmake/Version.cmake
	ext/libclementine-common/core/closure.cpp
	ext/libclementine-common/core/closure.h
	ext/libclementine-common/core/concurrentrun.h
	ext/libclementine-remote/remotecontrolmessages.proto
	ext/libclementine-tagreader/tagreader.cpp
	src/core/deletefiles.cpp
	src/core/deletefiles.h
	src/core/mac_utilities.h
	src/core/mergedproxymodel.h
	src/core/musicstorage.h
	src/core/organise.cpp
	src/core/organise.h
	src/core/player.cpp
	src/core/songloader.cpp
	src/core/utilities.cpp
	src/devices/connecteddevice.h
	src/devices/devicekitlister.h
	src/devices/devicemanager.cpp
	src/devices/devicemanager.h
	src/devices/deviceproperties.cpp
	src/devices/deviceview.cpp
	src/devices/giolister.cpp
	src/devices/gpodloader.cpp
	src/devices/gpodloader.h
	src/devices/mtploader.cpp
	src/devices/mtploader.h
	src/engines/gstengine.cpp
	src/engines/gstengine.h
	src/engines/gstenginepipeline.cpp
	src/globalsearch/globalsearchview.cpp
	src/internet/groovesharkservice.cpp
	src/internet/magnatunedownloaddialog.cpp
	src/library/groupbydialog.h
	src/library/librarydirectorymodel.cpp
	src/library/librarymodel.cpp
	src/library/libraryview.cpp
	src/main.cpp
	src/networkremote/networkremote.cpp
	src/networkremote/networkremote.h
	src/networkremote/outgoingdatacreator.cpp
	src/networkremote/outgoingdatacreator.h
	src/playlist/playlist.cpp
	src/playlist/playlistbackend.cpp
	src/playlist/playlistbackend.h
	src/playlist/playlistdelegates.cpp
	src/playlist/playlistview.h
	src/playlistparsers/plsparser.cpp
	src/smartplaylists/generator.h
	src/smartplaylists/querywizardplugin.cpp
	src/smartplaylists/searchpreview.cpp
	src/songinfo/songinfoview.h
	src/transcoder/transcoder.cpp
	src/ui/albumcovermanagerlist.cpp
	src/ui/mainwindow.cpp
	src/ui/organisedialog.cpp
	src/visualisations/projectmvisualisation.cpp
	src/visualisations/projectmvisualisation.h
	src/widgets/nowplayingwidget.cpp
	src/widgets/nowplayingwidget.h
	src/widgets/osd.h
	src/widgets/osd_x11.cpp
	src/wiimotedev/shortcuts.cpp
 2014-02-19 18:19:54 +01:00
John Maguire 29da035139 Set version number for 1.2.2 2014-02-04 11:48:07 +01:00
David Sansome c2ff72deba Merge branch 'release-1.2' 
Conflicts:
	cmake/Version.cmake
	src/main.cpp
 2013-11-26 10:10:04 +11:00
David Sansome fe34d4d028 Set the version to 1.2.1 2013-11-16 13:57:32 +11:00
Andreas cee800cba5 1.2 with git revision 2013-10-26 09:37:02 +02:00
Andreas 526dd25c01 Add preversion "p" so the stable 1.2 binaries won't be overridden. 2013-10-05 12:27:25 +02:00
David Sansome 06e8160fd2 Set the version to 1.2 final 2013-09-26 21:08:30 +10:00
John Maguire fba825bd92 Clementine 1.2 RC4 2013-09-18 01:25:21 +02:00
John Maguire 46773cb465 Clementine 1.2 RC3 2013-09-12 11:34:50 +02:00
John Maguire 3cd430af35 Clementine 1.2 RC2 2013-09-10 13:15:20 +02:00
David Sansome fdd22b4bb5 Oops :( 2013-08-18 19:30:40 +10:00
David Sansome bd03196ba3 Create a release branch for 1.2 and update the version 2013-08-18 14:12:24 +10:00
David Sansome 40f0994da4 Merge branch 'release-1.1' 2012-11-18 20:49:01 +11:00
David Sansome d766735141 Bump the version to 1.1.1 2012-11-18 09:55:05 +11:00
David Sansome 9c7526ccbb Include git revisions in the master branch version numbers 2012-10-25 08:36:56 +02:00
David Sansome c8312b7cdf Bump the version of the 1.1 branch from 1.1 RC1 to 1.1. 2012-10-16 22:58:54 +11:00
David Sansome 65503f63fc Create a 1.1 branch and bump the version number. 2012-09-24 20:17:37 +01:00
David Sansome 50c0cd78a3 Oops - add the git revision information even when forced 2012-02-28 19:34:37 +00:00
David Sansome d21cd0edd7 Maybe fix git revision numbers in PPA debs 2012-02-28 17:49:32 +00:00
David Sansome bc0623bc0d Merge commit '1.0.1' 2012-01-22 13:33:34 +00:00
David Sansome 8e3ce51304 Bump version to 1.0.1 2012-01-11 21:26:09 +00:00
David Sansome 5abfdf4eb0 Fix a cmake error when getting the git revision number of an exact tag checkout 
(cherry picked from commit 9e2e035ae1)
 2012-01-11 21:04:48 +00:00
David Sansome 9e2e035ae1 Fix a cmake error when getting the git revision number of an exact tag checkout 2011-12-28 14:13:12 +01:00
David Sansome b0e8f43dd6 Set master branch back to including git revision numbers in commits 2011-12-28 00:01:12 +00:00
David Sansome d5254cb02c Change version from 1.0rc1 to 1.0 2011-12-12 20:53:23 +00:00
David Sansome 7bc2de39b5 Prepend a big number to the mac version strings because we have to be bigger than the svn revision numbers that were there before 2011-12-02 14:56:26 +00:00
David Sansome c0ac798a71 Create a 1.0 release branch, and rework the way version numbers are done everywhere. 2011-12-02 14:48:19 +00:00
David Sansome c4280c2cf4 Maybe fix git revision numbers in RPM packages. 2011-08-28 01:18:13 +01:00
John Maguire a2e4f8e6b3 Update cmake version script to use git describe instead of svn info. 2011-07-19 16:59:42 +02:00
David Sansome a2ceca673c Bump trunk's version to 0.7.1 (oops), show an error when the spotify blob crashes, actually use the LD_LIBRARY_PATH that is created 2011-04-29 21:49:48 +00:00
David Sansome 468c970e65 Bump trunk's version to 0.7 2011-03-29 21:12:53 +00:00
David Sansome 5b34a11765 More version number fiddling 2011-01-03 14:33:03 +00:00
David Sansome 0fba393f6e Fix the version numbering mess 2011-01-03 14:21:10 +00:00
David Sansome ae261a7f0b Bump version to 0.6 2010-12-11 15:32:19 +00:00
John Maguire 6406216918 Don't try and get svn info if we're not using an svn checkout. 2010-12-06 13:41:06 +00:00
John Maguire b2ffc58070 Only check subversion info if $BUILDBOT_REVISION not set. 
Fix compile warning.
 2010-11-25 17:14:11 +00:00
John Maguire 8ac4e57cdf Fetch the subversion revision info automatically if possible. 2010-11-25 15:26:26 +00:00
David Sansome c19580cf9a Show the patch version in the version string. Fixes issue #825 2010-09-29 18:51:40 +00:00
David Sansome fe183d59fe Set trunk's version to 0.5 2010-09-19 20:44:31 +00:00
David Sansome 86401c2229 Use the debian distribution in non-buildbot packages too 2010-09-19 10:35:24 +00:00
David Sansome 74ff285946 Include the debian distribution name in the package version 2010-09-18 18:29:40 +00:00
David Sansome 3f1ec7bedf Set the deb version properly when not doing a buildbot build 2010-09-05 12:12:27 +00:00
David Sansome 64ee9749af Only use the ~rnnnn notation for debian packages, use .rnnnn for rpms 2010-09-05 11:48:56 +00:00
David Sansome aba01f63c7 Add a cmake option to specify the .deb distribution 2010-07-24 13:01:46 +00:00
David Sansome 724fa9539f The debian and rpm changelogs contain no useful information, so let's fill them automatically 2010-06-24 22:07:04 +00:00
David Sansome a09da98aab Bump trunk version to 0.4 2010-06-18 15:50:22 +00:00
David Sansome 40bb827fcd Make all the source files a single cmake target again. 2010-06-08 22:39:31 +00:00