Skip to content

Commit 24f9e21

Browse files
committed
fix version conflict part 2
1 parent 20d20b7 commit 24f9e21

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

data/com.github.ronnydo.colorpicker.appdata.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,23 @@
2222
<category>Development</category>
2323
</categories>
2424
<releases>
25-
​<release version="1.0.3" date="2018-04-27" urgency="medium">
25+
​<release version="1.0.5" date="2018-04-27" urgency="medium">
26+
​ <description>
27+
<ul>
28+
<li>Implement 'close with right-mouse-button' feature (issue #27)</li>
29+
<li>Update icon</li>
30+
<li>Add French, Spanish and Catalan translation</li>
31+
</ul>
32+
</description>
33+
​</release>
34+
​<release version="1.0.4" date="2018-04-27" urgency="medium">
35+
​ <description>
36+
<ul>
37+
<li>fix version conflict</li>
38+
</ul>
39+
</description>
40+
​</release>
41+
​<release version="1.0.3" date="2018-04-26" urgency="medium">
2642
​ <description>
2743
<ul>
2844
<li>Implement 'close with right-mouse-button' feature (issue #27)</li>

debian/changelog

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=low
1+
com.github.ronnydo.colorpicker (1.0.5) xenial; urgency=medium
22

33
* Implement 'close with right-mouse-button' feature (issue #27)
44
* Update icon
55
* Add French, Spanish and Catalan translation
66

7+
-- Ronny Dobra <ronnydobra at arcor dot de> Thu, 27 Apr 2017 18:31:00 +0100
8+
9+
com.github.ronnydo.colorpicker (1.0.4) xenial; urgency=medium
10+
11+
* fix version conflicts
12+
713
-- Ronny Dobra <ronnydobra at arcor dot de> Thu, 27 Apr 2017 13:31:00 +0100
814

15+
com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=medium
16+
17+
* Implement 'close with right-mouse-button' feature (issue #27)
18+
* Update icon
19+
* Add French, Spanish and Catalan translation
20+
21+
-- Ronny Dobra <ronnydobra at arcor dot de> Thu, 26 Apr 2017 13:31:00 +0100
22+
923
com.github.ronnydo.colorpicker (1.0.2) xenial; urgency=medium
1024

1125
* Implement "Don't add the same color to color history twice" (issue #24)

0 commit comments

Comments
 (0)