Merge branch 'stable-1.1'

Conflicts: include/Plugin.h src/core/Plugin.cpp
2026-05-17 19:24:52 -04:00 · 2014-09-02 16:59:04 +03:00
parent 23f720f81b f07287c771
commit c2d7cf787e
126 changed files with 2422 additions and 1061 deletions
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -40,6 +40,7 @@
 #include "SongEditor.h"
 #include "Effect.h"
 #include "lmmsversion.h"
+#include "base64.h"

 // bbTCO::defaultColor()
 #include "bb_track.h"