Skip to content

Commit

Permalink
Version bump to 7.3.4 (merge commit)
Browse files Browse the repository at this point in the history
Now we're on commit 5afdaeb; Changes from upstream we've pulled:

Version bump 7.3.3 -> 7.3.4 as upstream bumped to 2.3.4 on 5afdaeb
  • Loading branch information
zneix committed Aug 5, 2021
2 parents 5afdaeb + 4e51707 commit b251ac9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unversioned

## 2.3.4

- Major: Newly uploaded Twitch emotes are once again present in emote picker and can be autocompleted with Tab as well. (#2992)
- Major: Deprecated `/(un)follow` commands and (un)following in the usercards as Twitch has removed this feature for 3rd party applications. (#3076, #3078)
- Major: Added the ability to add nicknames for users. (#137, #2981)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ list(APPEND CMAKE_MODULE_PATH
"${CMAKE_SOURCE_DIR}/cmake/sanitizers-cmake/cmake"
)

project(chatterino VERSION 2.3.3)
project(chatterino VERSION 2.3.4)

option(BUILD_APP "Build Chatterino" ON)
option(BUILD_TESTS "Build the tests for Chatterino" OFF)
Expand Down
2 changes: 1 addition & 1 deletion resources/com.chatterino.chatterino.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
<binary>chatterino</binary>
</provides>
<releases>
<release version="2.3.3" date="2021-06-21"/>
<release version="2.3.4" date="2021-08-05"/>
</releases>
</component>
2 changes: 1 addition & 1 deletion src/common/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <QString>
#include <QtGlobal>

#define CHATTERINO_VERSION "7.3.3"
#define CHATTERINO_VERSION "7.3.4"

#if defined(Q_OS_WIN)
# define CHATTERINO_OS "win"
Expand Down

0 comments on commit b251ac9

Please sign in to comment.