Merge remote-tracking branch 'gperks/master'

Conflicts: taglib/asf/asfpicture.cpp taglib/it/itproperties.h
2025-11-16 22:52:57 -05:00 · 2011-07-28 19:03:46 +02:00
parent 364a840d83 19484c059d
commit 0730076a0f
8 changed files with 33 additions and 9 deletions
--- a/taglib/s3m/s3mproperties.h
+++ b/taglib/s3m/s3mproperties.h
@ -61,7 +61,6 @@ namespace TagLib {
      uchar  tempo()             const;
      uchar  bpmSpeed()          const;

-    protected:
      void setChannels(int channels);

      void setLengthInPatterns (ushort lengthInPatterns);