From 5ea47920ab483ee09c3680ec32607b87a0647765 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Wed, 26 Sep 2018 09:27:58 +0300
Subject: [PATCH] v0.6.1

---
 CHANGELOG.md                | 10 ++++++++++
 CMakeLists.txt              |  2 +-
 README.md                   |  2 +-
 appveyor.yml                | 12 ++++++------
 resources/nheko.appdata.xml |  1 +
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 709793c..a85a2ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.6.1] - 2018-09-26
+
+### Improvements
+- Add infinite scroll in member list. (#446)
+- Use QPushButton on the preview modal.
+
+### Bug fixes
+- Clear text selection when focus is lost. (#409)
+- Don't clear the member list when the modal is hidden. (#447)
+
 ## [0.6.0] - 2018-09-21
 
 ### Features
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8617093..43fcb97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(QtCommon)
 project(nheko LANGUAGES C CXX)
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "6")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
 set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
 set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
 set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
diff --git a/README.md b/README.md
index 6ccd5f9..21c6d25 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ nheko
 ----
 [![Build Status](https://travis-ci.org/mujx/nheko.svg?branch=master)](https://travis-ci.org/mujx/nheko)
 [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/mujx/nheko/branch/master)
-[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/mujx/nheko/releases/v0.6.0)
+[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/mujx/nheko/releases/v0.6.1)
 [![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://github.com/mujx/nheko/releases/nightly)
 [![Chat on Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#nheko:matrix.org)
 [![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko)
diff --git a/appveyor.yml b/appveyor.yml
index 286e13f..f98bd24 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 ---
 
-version: 0.6.0-{build}
+version: 0.6.1-{build}
 
 configuration: Release
 image: Visual Studio 2017
@@ -37,8 +37,8 @@ build_script:
     # VERSION format:     branch-master/branch-1.2
     # INSTVERSION format: x.y.z
     # WINVERSION format:  9999.0.0.123/1.2.0.234
-    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.0
-    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.0
+    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.1
+    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.1
     - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0
     - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER%
     # VERSION format:     v1.2.3/v1.3.4
@@ -110,9 +110,9 @@ after_build:
     - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta
     - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta
     # Amend version and date
-    - sed -i "s/__VERSION__/0.6.0/" installer\config\config.xml
-    - sed -i "s/__VERSION__/0.6.0/" installer\packages\com.mujx.nheko\meta\package.xml
-    - sed -i "s/__VERSION__/0.6.0/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
+    - sed -i "s/__VERSION__/0.6.1/" installer\config\config.xml
+    - sed -i "s/__VERSION__/0.6.1/" installer\packages\com.mujx.nheko\meta\package.xml
+    - sed -i "s/__VERSION__/0.6.1/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
     - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml
     - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
     # Copy nheko data
diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml
index 27dd633..3f29fd2 100644
--- a/resources/nheko.appdata.xml
+++ b/resources/nheko.appdata.xml
@@ -19,6 +19,7 @@
     <url type="homepage">https://github.com/mujx/nheko</url>
     <update_contact>https://github.com/mujx</update_contact>
     <releases>
+        <release version="0.6.1" date="2018-09-26" />
         <release version="0.6.0" date="2018-09-21" />
         <release version="0.5.5" date="2018-09-01" />
         <release version="0.5.4" date="2018-08-21" />