-
…ogramming into new_Kira Conflicts: src/js/gb.js
-
# Conflicts: # src/js/util/util.js
-
…ogramming into feature/20170112_Multiple_files Conflicts: src/js/gb.js
-
- 优化播放页面dom结构 - 添加参数播放和录制页面所需参数不正确是不予展示主要功能界面
-
- 优化js设置dom大小
-
# Conflicts: # src/css/recording.css # src/index.html