Merge v0.6.0 and v0.6.1 #29

Merged
dorian merged 30 commits from version/0.5.1 into master 2024-10-17 17:52:37 +02:00
3 changed files with 6 additions and 3 deletions
Showing only changes of commit 767556c083 - Show all commits

View file

@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
# [0.06] - UNRELEASED # [0.6.0] - UNRELEASED
### Changed ### Changed
- The subtitle in results and startlists is now the route name instead of the category name - The subtitle in results and startlists is now the route name instead of the category name
@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- German translations - German translations
- URL handler for https://l.bluerock.dev and https://app.bluerock.dev - URL handler for https://l.bluerock.dev and https://app.bluerock.dev
### Fixed
- Rare issue with missing background in boulder result rect
# [0.05] - 2021-06-07 # [0.05] - 2021-06-07
### Changed ### Changed
- the boulder result rect doesn't have a background if there is no result now - the boulder result rect doesn't have a background if there is no result now

View file

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="com.itsblue.blueROCKtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto"> <manifest package="com.itsblue.blueROCK" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. --> Remove the comment if you do not require these default permissions. -->
<!-- %%INSERT_PERMISSIONS --> <!-- %%INSERT_PERMISSIONS -->

View file

@ -1,7 +1,7 @@
QT += quick qml quickcontrols2 purchasing QT += quick qml quickcontrols2 purchasing
CONFIG += c++11 CONFIG += c++11
VERSION = 0.5.0 VERSION = 0.6.0
TARGET = blueROCK TARGET = blueROCK
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use