Code merge and minor fixes
This commit is contained in:
parent
be0d427dd8
commit
52a3cd6540
4 changed files with 7 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<!-- Written by QtCreator 4.0.1, 2017-07-20T15:26:01. -->
|
<!-- Written by QtCreator 4.0.1, 2017-10-12T14:57:03. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>EnvironmentId</variable>
|
<variable>EnvironmentId</variable>
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
||||||
<value type="int">1</value>
|
<value type="int">0</value>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
||||||
|
|
|
@ -39,3 +39,6 @@
|
||||||
- Better tablet displaying
|
- Better tablet displaying
|
||||||
- "boosted" notification bugfix
|
- "boosted" notification bugfix
|
||||||
- ES lang update by Caballlero
|
- ES lang update by Caballlero
|
||||||
|
|
||||||
|
* Thu October 10 2017 Dusko Angirevic <dysko@me.com> 0.2.1-0
|
||||||
|
- Added bugs for later (merging branches and cotributions)
|
||||||
|
|
|
@ -13,7 +13,7 @@ Name: harbour-tooter
|
||||||
%{!?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: Tooter
|
Summary: Tooter
|
||||||
Version: 0.2.0
|
Version: 0.2.1
|
||||||
Release: 1
|
Release: 1
|
||||||
Group: Qt/Qt
|
Group: Qt/Qt
|
||||||
License: LICENSE
|
License: LICENSE
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Name: harbour-tooter
|
Name: harbour-tooter
|
||||||
Summary: Tooter
|
Summary: Tooter
|
||||||
Version: 0.2.0
|
Version: 0.2.1
|
||||||
Release:
|
Release:
|
||||||
# The contents of the Group field should be one of the groups listed here:
|
# The contents of the Group field should be one of the groups listed here:
|
||||||
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
|
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
|
||||||
|
|
Loading…
Reference in a new issue