diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c91e8b3e4..d78584a85 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +0.26.0 + +* added the ability to rebind UP, DOWN, LEFT, RIGHT, PAGE_UP, PAGE_DOWN, END and + HOME keys to allow for VIM-style key bindings +* fixed a focus related bug when switching between main views + +-------------------------------------------------------------------------------- + 0.25.2 musikcube: diff --git a/CMakeLists.txt b/CMakeLists.txt index a429b574c..97ea9d9a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 3.0) project(musikcube) set (musikcube_VERSION_MAJOR 0) -set (musikcube_VERSION_MINOR 25) -set (musikcube_VERSION_PATCH 2) +set (musikcube_VERSION_MINOR 26) +set (musikcube_VERSION_PATCH 0) set (musikcube_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}") include(CMakeToolsHelpers OPTIONAL) diff --git a/src/musikcube/app/util/Version.h b/src/musikcube/app/util/Version.h index dfc8bf1e1..626753616 100644 --- a/src/musikcube/app/util/Version.h +++ b/src/musikcube/app/util/Version.h @@ -1,6 +1,6 @@ #pragma once #define VERSION_MAJOR 0 -#define VERSION_MINOR 25 -#define VERSION_PATCH 2 -#define VERSION "0.25.2" +#define VERSION_MINOR 26 +#define VERSION_PATCH 0 +#define VERSION "0.26.0" diff --git a/src/musikcube/musikcube.rc b/src/musikcube/musikcube.rc index e23e12ff9..5b16eb00e 100644 Binary files a/src/musikcube/musikcube.rc and b/src/musikcube/musikcube.rc differ diff --git a/src/musikdroid/build.gradle b/src/musikdroid/build.gradle index dd8602ba2..26dafac8a 100644 --- a/src/musikdroid/build.gradle +++ b/src/musikdroid/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta5' + classpath 'com.android.tools.build:gradle:3.0.0-beta6' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }