summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-15 16:18:07 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-15 16:18:07 +0000
commit255775e46af9da10c0ab117282c272dc80f6f954 (patch)
tree438bf5b87e7c06b5f0ffdecd6f6c1ecfd774167c
parent1746f110d87be8ced7318dcc4270e228399b1284 (diff)
downloaddrakx-255775e46af9da10c0ab117282c272dc80f6f954.tar
drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar.gz
drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar.bz2
drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar.xz
drakx-255775e46af9da10c0ab117282c272dc80f6f954.zip
fix mismerge
-rw-r--r--perl-install/NEWS1
1 files changed, 0 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5862040b8..0667eba0e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,7 +5,6 @@ Version 14.21.4 - 15 April 2013
o offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
- drakclock:
o do not crash if timezones cannot be listed (mga#6787)
-- fix crashing when a banner icon doesn't exist (mga#5223)
Version 14.21.3 - 19 September 2012