Commit Graph

144 Commits

Author SHA1 Message Date
John Maguire ca6f42fae1 Fix Fedora version for semver 2020-04-11 20:05:07 +01:00
John Maguire 83f38f8df4 Bump to RC2
This might fix Fedora builds
2020-04-11 18:30:40 +01:00
John Maguire 2aa81af6ca 1.4 rc1 2020-01-02 20:59:23 +00:00
John Maguire 51c5939ba6 Set version 2019-12-29 21:16:57 +00:00
John Maguire cb6cd7c485 Merge remote-tracking branch 'origin/master' into qt5 2019-10-04 16:51:43 +01:00
luz.paz fb93ae4b02 Fix misc. source comment typos
Typos found via `codespell`
2019-08-21 23:43:16 -04:00
Jonas Kvinge a5e8eba91c Merge remote-tracking branch 'upstream/master' into qt5-update 2018-06-29 02:38:19 +02:00
Jonas Kvinge 41ed505277 Fix git revision string (#6083) 2018-06-13 09:38:56 +01:00
Chocobozzz fc517ce7a5 Merge remote-tracking branch 'upstream/master' into qt5 2017-06-05 21:28:05 +02:00
Jacob Henner e7ec942256 Explicitly using python2 to prevent errors on py3-default systems 2017-03-13 18:58:15 +00:00
Chocobozzz 18a89f78a9 Merge remote-tracking branch 'upstream/master' into qt5 2016-10-07 14:30:09 +02:00
John Maguire edece5c631 Fix git version naming 2016-07-06 11:54:33 +01:00
Chocobozzz 0aa3405274 Merge remote-tracking branch 'upstream/master' into qt5 2016-05-09 12:46:08 +02:00
John Maguire 1dfd71ea7f Merge branch 'release-1.3' 2016-04-19 18:00:00 +01:00
John Maguire 44d6b930ac 1.3.1 2016-04-19 16:08:19 +01:00
John Maguire 363fde44dd Turn git revisions back on 2016-04-19 16:07:16 +01:00
John Maguire 97ee6d3202 1.3 release 2016-04-15 14:26:04 +01:00
Chocobozzz e6e189967d Merge remote-tracking branch 'upstream/master' into qt5 2016-02-29 18:03:02 +01:00
John Maguire d2e6282235 Clementine 1.3RC2 2016-02-17 16:38:19 +00:00
John Maguire d92fe15123 Bump spotify lib & blob version.
(cherry picked from commit 8ef1d4cae2)
2016-01-28 14:55:49 +00:00
John Maguire 8ef1d4cae2 Bump spotify lib & blob version. 2016-01-28 14:33:04 +00:00
David Sansome eabe451bd4 Use %{?dist} to get the rpm distro name, and remove the old Rpm.cmake
(cherry picked from commit 1f864f3522)
2015-12-31 16:03:04 +11:00
David Sansome 1f864f3522 Use %{?dist} to get the rpm distro name, and remove the old Rpm.cmake 2015-12-31 16:02:19 +11:00
David Sansome c54ab370ff Set the version to 1.3.0 RC1 2015-12-31 11:17:50 +11:00
Chocobozzz ff7026c9fe Merge remote-tracking branch 'upstream/master' into qt5 2015-12-13 20:05:12 +01:00
David Sansome 978d849164 Create .xz instead of .gz for source releases 2015-12-13 15:52:30 +11:00
Chocobozzz f5414d5535 Update main cmakelists to qt5 2015-04-11 23:24:05 +02:00
David Sansome 442d126b03 Hack to make the C++11 override keyword work with old compilers. 2014-09-26 20:33:02 +10:00
David Sansome 3f0dc01b06 Make Spotify work with gstreamer-1.0. 2014-09-21 22:39:30 +10:00
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
David Sansome c36f4e46db Add "make format-diff" and "make format" commands that use clang-format to reformat source. 2014-02-12 01:20:49 +11:00
Mladen Pejaković 2114494375 Fix extraction of context messages from Qt ui files 2014-02-08 15:08:37 +01:00
Mladen Pejaković 39147b9cd0 Allow context creation in po files. Brings #4163 to effect 2014-02-07 17:20:59 +01:00
John Maguire 73ac5bc1ee Print out the Clementine display version in the cmake summary.
(cherry picked from commit 9858a9d506)
2014-02-04 12:01:46 +01:00
John Maguire 29da035139 Set version number for 1.2.2 2014-02-04 11:48:07 +01:00
John Maguire 9858a9d506 Print out the Clementine display version in the cmake summary. 2014-01-28 14:54:52 +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