Merge branch 'develop' of http://github.com/audiokit/AudioKit into develop
Автор
Aurelius Prochazka
Aurelius ProchazkaКоммитерAurelius Prochazka
9 лет назад Aurelius Prochazka Файлов изменено: 5
+6–6
5e8d866
AudioKit.podspec.json
+2–2
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name":"AudioKit", | ||
| "version":"3.4.3", | ||
| "version":"3.5", | ||
| "authors":{ | ||
| "Aurelius Prochazka":"audiokit@audiokit.io" | ||
| }, | ||
| @@ -12,7 +12,7 @@ | ||
| "social_media_url":"http://twitter.com/AudioKitMan", | ||
| "documentation_url":"http://audiokit.io/docs/", | ||
| "source":{ | ||
| "http":"https://github.com/audiokit/AudioKit/releases/download/v3.4.3/AudioKit.framework.zip" | ||
| "http":"https://github.com/audiokit/AudioKit/releases/download/v3.5/AudioKit.framework.zip" | ||
| }, | ||
| "summary":"Open-source audio synthesis, processing, & analysis platform.", | ||
| "platforms":{ |
AudioKit/iOS/.../Info.plist
+1–1
| @@ -15,7 +15,7 @@ | ||
| <key>CFBundlePackageType</key> | ||
| <string>FMWK</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>3.4.3</string> | ||
| <string>3.5</string> | ||
| <key>CFBundleSignature</key> | ||
| <string>????</string> | ||
| <key>CFBundleVersion</key> |
AudioKit/macOS/.../Info.plist
+1–1
| @@ -15,7 +15,7 @@ | ||
| <key>CFBundlePackageType</key> | ||
| <string>FMWK</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>3.4.3</string> | ||
| <string>3.5</string> | ||
| <key>CFBundleSignature</key> | ||
| <string>????</string> | ||
| <key>CFBundleVersion</key> |
AudioKit/tvOS/.../Info.plist
+1–1
| @@ -15,7 +15,7 @@ | ||
| <key>CFBundlePackageType</key> | ||
| <string>FMWK</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>3.4.3</string> | ||
| <string>3.5</string> | ||
| <key>CFBundleSignature</key> | ||
| <string>????</string> | ||
| <key>CFBundleVersion</key> |
VERSION
+1–1
| @@ -1 +1 @@ | ||
| 3.4.3 | ||
| 3.5 |
Cherry-pick
Команда cherry-pick позволяет выбрать отдельные коммиты из одной ветки и применить их к другой.
