Merge branch 'master' into release

This commit is contained in:
louis f 2018-10-21 01:21:22 -04:00
commit 63a21c69d8

View File

@ -727,6 +727,19 @@
"seconds": 17.617
}
},
"music_knock_out": {
"duration": 103.6995625,
"loop_end": {
"samples_48k": 4977483,
"samples_native": 3318322,
"seconds": 103.6975625
},
"loop_start": {
"samples_48k": 1095744,
"samples_native": 730496,
"seconds": 22.828
}
},
"music_koi_no_okehazama": {
"duration": 76.1594375,
"loop_end": {