Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mainブランチとのconflict解消がうまく行ってなかったのでリトライ #206

Merged
merged 18 commits into from
Jul 24, 2022
Merged

mainブランチとのconflict解消がうまく行ってなかったのでリトライ #206

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f1ce849
デフォルト引数はC言語では使えないのでC++のみに有効になるように変更した (#122)
qwerty2501 May 8, 2022
c66081e
initializeで全モデルを読み込まなくても良いようにした (#124)
Hiroshiba May 9, 2022
53d43f8
workflow_dispatchでもビルド開始可能に (#127)
Hiroshiba May 11, 2022
4592b93
ビルド時にREADMEファイルを追加する (#131)
Hiroshiba May 14, 2022
6253a8d
append unit testing framework (#121)
qwerty2501 May 15, 2022
d62a44b
static castやnullopt比較をやめ、value関数などを使うようにする (#118)
y-chan May 28, 2022
c60dc21
coreのビルド時にバージョン情報がちゃんと
Hiroshiba May 30, 2022
7ff2e7f
hotfix イントネーションの推論をCPUで行うように (#146)
Hiroshiba Jun 3, 2022
de8394f
python example for 0.12, update FFI (#138)
Yosshi999 Jun 3, 2022
ea641e5
Merge tag '0.12.1'
Hiroshiba Jun 4, 2022
1ca62a8
.gitignore open_jtalk_dic in example (#148)
nebocco Jun 4, 2022
c47d055
C++サンプルコードへのリンクを追加 (#142)
Hiroshiba Jun 9, 2022
73a621f
コード署名できるようにする (#164)
Hiroshiba Jul 4, 2022
50082b6
inputのbooleanは文字列として渡ってくるので判定を修正 (#166)
Hiroshiba Jul 10, 2022
c2c1d12
Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Jul 23, 2022
05d7776
Merge branch 'rust' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Jul 24, 2022
e7c20f8
Revert "[Rust]mainとのconflict解消 (#204)"
qwerty2501 Jul 24, 2022
fa90295
Merge branch 'feature/resolve-conflict-from-main' of github.com:qwert…
qwerty2501 Jul 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.