Merge tag 'v0.21.26' into master

release v0.21.26
2020-09-21 15:19:49 +02:00
parent 5130acf3ea 566787f041
commit bc47a16943
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -40,7 +40,7 @@ ver 0.22 (not yet released)
 * switch to C++17
  - GCC 7 or clang 4 (or newer) recommended

-ver 0.21.26 (not yet released)
+ver 0.21.26 (2020/09/21)
 * database
  - inotify: obey ".mpdignore" files
 * output
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@ -34,12 +34,11 @@
 #include <cdio/iso9660.h>

 #include <array>
+#include <utility>

 #include <stdlib.h>
 #include <string.h>

-#include <utility>
-
 struct Iso9660 {
 	iso9660_t *const iso;