Merge branch 'start2' of git@git.ustclug.org:aaronwang/vlc-multisubs.git into start2
commitb5ec5568ae5fdd07c51a435d647bb5db1e244154
authorAaron Wang <hugh1234@mail.ustc.edu.cn>
Sat, 15 Aug 2015 10:18:13 +0000 (15 18:18 +0800)
committerAaron Wang <hugh1234@mail.ustc.edu.cn>
Sat, 15 Aug 2015 10:18:13 +0000 (15 18:18 +0800)
tree9b947eee500b1684f0cb83ce5da10d631eec697a
parent4deab6079451ac2ebcdf8d3e20af555bb40ed6e3
parent2240c5cb6ab225c0adee9e96ced838029b0ed9cd
Merge branch 'start2' of git@git.ustclug.org:aaronwang/vlc-multisubs.git into start2