Pick commits from the DANEREPO branch

b61aac86 · root · 71cacdd4 · b61aac86
Commit b61aac86 authored Sep 20, 2016 by root
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

changelog src/debian/changelog +1 -7

No files found.
--- a/src/debian/changelog
+++ b/src/debian/changelog
-xia (2.0~beta1-2) unstable; urgency=medium
-
-  * Add xia-converter in conflicts.
-
- -- François Lafont <francois.lafont@ac-versailles.fr>  Sat, 17 Sep 2016 01:29:41 +0200
-
-xia (2.0~beta1-1) unstable; urgency=medium
+xia (2.0~beta1-4) unstable; urgency=medium

  * New upstream release.