OSDN Git Service

merge
authoryuki <yuki@c066991c-cf13-ec4a-a49a-846e61667af5>
Mon, 12 Apr 2010 09:03:59 +0000 (09:03 +0000)
committeryuki <yuki@c066991c-cf13-ec4a-a49a-846e61667af5>
Mon, 12 Apr 2010 09:03:59 +0000 (09:03 +0000)
commitdea528f71e419f5cca9900121cfc50709f46be45
tree0d55f03795796de0c958d6560191096eae9fff51
parent4e7e9eef76b343f220f5d7a23ae8a8ba6660eb89
merge
20100202_prompt
349-360

git-svn-id: http://192.168.11.7/svn/saccubus/trunk@361 c066991c-cf13-ec4a-a49a-846e61667af5
12 files changed:
frontend/nbproject/project.properties
frontend/src/saccubus/ConvertStopFlag.java
frontend/src/saccubus/MainFrame.java
frontend/src/saccubus/Saccubus.java
frontend/src/saccubus/converter/Converter.java
frontend/src/saccubus/converter/FfmpegCommand.java
frontend/src/saccubus/converter/profile/GeneralSetting.java [new file with mode: 0644]
frontend/src/saccubus/converter/profile/Profile.java
frontend/src/saccubus/net/TextProgressListener.java
frontend/src/saccubus/prompt/Prompt.java
frontend/src/saccubus/properties/BasicSetting.java
frontend/src/saccubus/properties/SProperties.java