0925 begin
0925_start
editPicture modify
Merge branch 'master' of github.com:fvi-att/MocPlanManga2014 into 0925_bugfix
EditPictureWindow modify
Merge pull request #14 from NJnb6/EditPictureWindow_modify

マージしました
bug fix
Merge branch 'Merge0920'