nicd/SailTime
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into qa

Browse source
This commit is contained in:
Mikko Ahlroth 2014-02-24 14:56:48 +02:00
commit 0daccda351
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qml/harbour-sailtime.qml
View file

@ -103,7 +103,7 @@ ApplicationWindow
// Divide uptime to days, hours and minutes // Divide uptime to days, hours and minutes
function divideUptime(seconds) { function divideUptime(seconds) {
var days = Math.floor(seconds / 84600); var days = Math.floor(seconds / 86400);
var hours = Math.floor(seconds / 3600 % 24); var hours = Math.floor(seconds / 3600 % 24);
var minutes = Math.floor(seconds / 60 % 60); var minutes = Math.floor(seconds / 60 % 60);
return { return {

2
qml/pages/AboutPage.qml
View file

@ -29,7 +29,7 @@ Page {
Label { Label {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: "SailTime 1.1.1" text: "SailTime 1.1.2"
color: Theme.highlightColor color: Theme.highlightColor
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeLarge
} }

4
rpm/harbour-sailtime.spec
View file

@ -13,8 +13,8 @@ Name: harbour-sailtime
%{!?qtc_make:%define qtc_make make} %{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir} %{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: SailTime Summary: SailTime
Version: 1.1.1 Version: 1.1.2
Release: 2 Release: 1
Group: Qt/Qt Group: Qt/Qt
License: MIT Expat licence License: MIT Expat licence
URL: http://example.org/ URL: http://example.org/

4
rpm/harbour-sailtime.yaml
View file

@ -1,7 +1,7 @@
Name: harbour-sailtime Name: harbour-sailtime
Summary: SailTime Summary: SailTime
Version: 1.1.1 Version: 1.1.2
Release: 2 Release: 1
Group: Qt/Qt Group: Qt/Qt
URL: http://example.org/ URL: http://example.org/
License: "MIT Expat licence" License: "MIT Expat licence"