Merge branch '5.2.x'

* 5.2.x:
  server/schedule.c: Maintain separate variables for raw and resolved tracks.
  lib/printf.h, libtests/t-printf.c: Bodge to inhibit warning from GCC 9.

diff --git a/debian/changelog b/debian/changelog
index 097611ecad9925741d1a842227081de6a34b0f69..755c06b39ad167223440ffd0da17a8dc312ff60f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+disorder (5.2.99~) unstable; urgency=medium
+
+  * (placeholder for next minor release)
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Mon, 04 May 2020 19:50:31 +0100
+
 disorder (5.2) unstable; urgency=medium
 
   * Disorder 5.2.