Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into chatterino7
Browse files Browse the repository at this point in the history
  • Loading branch information
Nerixyz committed Dec 14, 2024
2 parents b9a8305 + 13d871f commit 9d576dc
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .CI/chatterino-installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Chatterino7"
#define MyAppVersion "7.5.1"
#define MyAppVersion "7.5.2"
#define MyAppPublisher "7TV"
#define MyAppURL "https://www.chatterino.com"
#define MyAppExeName "chatterino.exe"
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.c7.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 7.5.2-beta.1

- Minor: Added setting to disable animated 7TV badges (3bbcc9f4a01a015f93f7855be36312e56968ac5f)
- Minor: Added setting to disable 7TV paint shadows (689235b28af59e950987ede595c29bc26f8c8776)
- Bugfix: Paints are no longer rendered in system messages (b55e723fcea9520f47b1a6bf786a52011ffc7289)
Expand Down
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.5.2-beta.1

- Major: Add option to show pronouns in user card. (#5442, #5583)
- Major: Release plugins alpha. (#5288)
- Major: Improve high-DPI support on Windows. (#4868, #5391, #5664, #5666)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if(BUILD_BENCHMARKS)
endif()

project(chatterino
VERSION 7.5.1
VERSION 7.5.2
DESCRIPTION "Chat client for twitch.tv"
HOMEPAGE_URL "https://chatterino.com/"
)
Expand Down
3 changes: 3 additions & 0 deletions resources/com.chatterino.chatterino.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
<binary>chatterino</binary>
</provides>
<releases>
<release version="7.5.2~beta1" date="2024-12-14">
<url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.2-beta.1</url>
</release>
<release version="7.5.1" date="2024-04-28">
<url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.1</url>
</release>
Expand Down
2 changes: 1 addition & 1 deletion src/common/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace chatterino {
* - 2.4.0-alpha.2
* - 2.4.0-alpha
**/
inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.1");
inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.2-beta.1");

class Version
{
Expand Down

0 comments on commit 9d576dc

Please sign in to comment.