dorian
|
59bf853f0a
|
Merge branch 'internal_makeover'
# Conflicts:
# .gitignore
# README.md
# graphics/Buzzer.xcf
# graphics/icons/startpad.png
# graphics/icons/user.png
# graphics/speedclimbing_stopwatch.xcf
# graphics/startpad.xcf
# qml/SettingsDialog.qml
# qml/components/ConnectionDelegate.qml
# qml/components/ConnectionIcon.qml
# qml/components/FadeAnimation.qml
# qml/components/ProgressCircle.qml
# qml/main.qml
# qml/qml.qrc
# shared.qrc
# sources/appsettings.cpp
# sources/main.cpp
# speedclimbing_stopwatch.pro
# translations/de_DE.qm
# translations/de_DE.ts
|
2019-08-08 19:08:35 +02:00 |
|
|
|
ecd141515f
|
updated translations
|
2019-04-15 13:31:55 +02:00 |
|
|
|
ff9cf3c3d6
|
updated translations
|
2019-04-08 18:02:20 +02:00 |
|
|
|
7d481df7af
|
- removed obsolete translation
- added new delegate with slider
|
2019-04-08 18:02:10 +02:00 |
|
|
|
952964ae46
|
removed old dublicates
|
2019-04-08 18:01:39 +02:00 |
|
|
|
fe6c62e9fc
|
- Added multi-language support and a german translation
- Cleaned the code up
|
2018-08-14 17:07:42 +02:00 |
|
|
|
bd77301a9c
|
- Added multi-language support and a german translation
- Cleaned the code up
|
2018-08-14 17:07:42 +02:00 |
|
