diff --git a/ChangeLog b/ChangeLog index 78f93cfc9..bb7173c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in 4.2: +Changes in 4.2rc1: - Make it possible to check individual files of a torrent - Data checks for multiple torrents can now get started at the same time (265611) - Make links clickable in the status tab comments field (266089) diff --git a/ktorrent/main.cpp b/ktorrent/main.cpp index 2f8a2581b..4b87abd4a 100644 --- a/ktorrent/main.cpp +++ b/ktorrent/main.cpp @@ -94,7 +94,7 @@ int main(int argc, char **argv) "ktorrent", 0, ki18n("KTorrent"), kt::VERSION_STRING, ki18n("Bittorrent client for KDE"), KAboutData::License_GPL, - ki18n("(C) 2005 - 2011 Joris Guisson and Ivan Vasic"), + ki18n("(C) 2005 - 2012 Joris Guisson and Ivan Vasic"), KLocalizedString(), "http://www.ktorrent.org/"); diff --git a/libktcore/ktversion.h b/libktcore/ktversion.h index 2da9fbcbc..c2fb10ef2 100644 --- a/libktcore/ktversion.h +++ b/libktcore/ktversion.h @@ -23,14 +23,14 @@ #include #include "util/constants.h" -#define KT_VERSION_MACRO "4.2dev" +#define KT_VERSION_MACRO "4.2rc1" namespace kt { const bt::Uint32 MAJOR = 4; const bt::Uint32 MINOR = 2; - const bt::Uint32 RELEASE = 0; - const bt::VersionType VERSION_TYPE = bt::DEVEL; + const bt::Uint32 RELEASE = 1; + const bt::VersionType VERSION_TYPE = bt::RELEASE_CANDIDATE; const char VERSION_STRING[] = KT_VERSION_MACRO; }