From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 28 Jul 2019 12:24:45 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/afh-preserve'
X-Git-Tag: v0.6.3~43
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a1c4cc4b26f72c19e12100d47a9da3c449aab3e7;p=paraslash.git

Merge branch 'refs/heads/t/afh-preserve'

A single patch which adds --preserve to para_afh.

* refs/heads/t/afh-preserve:
  afh: Implement --preserve.
---

a1c4cc4b26f72c19e12100d47a9da3c449aab3e7
diff --cc NEWS.md
index 1aca9b0a,55ef3be9..d8813b3f
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,16 -1,6 +1,19 @@@
  NEWS
  ====
  
 +----------------------------------------------
 +0.6.3 (to be announced) "generalized activity"
 +----------------------------------------------
 +
 +- The ff command now accepts a negative argument to instruct the
 +  virtual streaming system to jump backwards in the current audio
 +  stream. The old syntax (e.g., "ff 30-") is still supported but it
 +  is deprecated and no longer documented. The compatibility code is
 +  sheduled for removal after 0.7.0.
 +
++- para_afh: New option: --preserve to reset the modification time to
++  the value of the original file after meta data modification.
++
  --------------------------------------
  0.6.2 (2018-06-30) "elastic diversity"
  --------------------------------------