Skip to content

Commit

Permalink
2.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
fourtf committed Sep 22, 2019
1 parent fc049d8 commit 2c25c8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/common/Version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Version::Version()
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING
this->dateOfBuild_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING))
.remove('"').split(' ')[0];
.remove('"')
.split(' ')[0];
#endif

// "Full" version string, as displayed in window title
Expand Down
4 changes: 2 additions & 2 deletions src/common/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <QtGlobal>

#define CHATTERINO_VERSION "2.1.4"
#define CHATTERINO_VERSION "2.1.5"

#if defined(Q_OS_WIN)
# define CHATTERINO_OS "win"
Expand Down Expand Up @@ -35,4 +35,4 @@ class Version
QString fullVersion_;
};

};
}; // namespace chatterino
6 changes: 3 additions & 3 deletions src/providers/bttv/BttvEmotes.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "providers/bttv/BttvEmotes.hpp"

#include <QJsonArray>
#include <QThread>

#include "common/Common.hpp"
#include "common/NetworkRequest.hpp"
#include "debug/Log.hpp"
Expand All @@ -8,9 +11,6 @@
#include "messages/ImageSet.hpp"
#include "providers/twitch/TwitchChannel.hpp"

#include <QJsonArray>
#include <QThread>

namespace chatterino {
namespace {
Url getEmoteLink(QString urlTemplate, const EmoteId &id,
Expand Down

0 comments on commit 2c25c8a

Please sign in to comment.