OSDN Git Service

Merge branch 'master' into dev20110528_setting_reduce
authoryukihane <yukihane.feather@gmail.com>
Wed, 3 Aug 2011 17:18:07 +0000 (02:18 +0900)
committeryukihane <yukihane.feather@gmail.com>
Wed, 3 Aug 2011 17:18:07 +0000 (02:18 +0900)
commitee0bf450b1ce23271f8fc905a612c3613b3387e9
tree53d1ac618c5874e0889a63694424adb6401b364c
parentc1176ff7826d2183062a5866f6391738a7af9445
parentc12a44e6c96815997b30770f10718c3fceb15891
Merge branch 'master' into dev20110528_setting_reduce

Conflicts:
.gitignore
frontend/nbproject/project.properties
frontend/nbproject/project.properties
frontend/src/saccubus/MainFrame.java
frontend/src/saccubus/converter/FfmpegCommand.java
frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
frontend/src/saccubus/prompt/Prompt.java
frontend/src/saccubus/properties/MovieSetting.java
frontend/src/saccubus/properties/SProperties.java