Skip to content

Commit

Permalink
Merge branch 'main' into dev/1.10.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	demos/demo-android/app/build.gradle
#	demos/demo-ios/Podfile
#	demos/demo-react-native/package.json
#	docs/tutorial-android.ja.md
#	docs/tutorial-android.md
#	flutter/android/build.gradle
#	flutter/ios/theta_client_flutter.podspec
#	flutter/lib/capture/capture.dart
#	flutter/lib/capture/capture_builder.dart
#	flutter/pubspec.yaml
#	kotlin-multiplatform/build.gradle.kts
#	kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/capture/Capture.kt
#	kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/capture/PhotoCapture.kt
#	kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/capture/VideoCapture.kt
#	react-native/android/build.gradle
#	react-native/package.json
#	react-native/src/capture/capture.ts
#	react-native/src/capture/photo-capture.ts
#	react-native/theta-client-react-native.podspec
  • Loading branch information
osakila committed Jul 17, 2024
2 parents c14d002 + 5576683 commit 9025a22
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9025a22

Please sign in to comment.