Merge conflicts

RitaAndAurora · Jun 14, 2021 · 3a50ae0 · 3a50ae0
2 parents 4d7ebf3 + 0a3aa8a
commit 3a50ae0
Show file tree

Hide file tree

Showing 38 changed files with 3,360 additions and 2,283 deletions.
diff --git a/Builds/MacOSX/Info-AU.plist b/Builds/MacOSX/Info-AU.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>CFBundleVersion</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>
@@ -41,7 +41,7 @@
         <key>subtype</key>
         <string>DDRA</string>
         <key>version</key>
-        <integer>66048</integer>
+        <integer>66049</integer>
         <key>resourceUsage</key>
         <dict>
           <key>network.client</key>

diff --git a/Builds/MacOSX/Info-Standalone_Plugin.plist b/Builds/MacOSX/Info-Standalone_Plugin.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>CFBundleVersion</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>

diff --git a/Builds/MacOSX/Info-VST.plist b/Builds/MacOSX/Info-VST.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>CFBundleVersion</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>

diff --git a/Builds/MacOSX/Info-VST3.plist b/Builds/MacOSX/Info-VST3.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>CFBundleVersion</key>
-    <string>1.2</string>
+    <string>1.2.1</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>