OSDN Git Service

merge.
authoryuki <yuki@c066991c-cf13-ec4a-a49a-846e61667af5>
Fri, 18 Dec 2009 10:38:22 +0000 (10:38 +0000)
committeryuki <yuki@c066991c-cf13-ec4a-a49a-846e61667af5>
Fri, 18 Dec 2009 10:38:22 +0000 (10:38 +0000)
commit2514ecfc2bc1464d42117c8e5804bd778bb29656
tree36045d1ac95cba609431f7da32a037f5fa5deb8d
parent06a71a09346f61759b0cabb8c00d6ee40c9172c9
merge.
20091213_frontend_filename_autocomplete
r224-r299

git-svn-id: http://192.168.11.7/svn/saccubus/trunk@300 c066991c-cf13-ec4a-a49a-846e61667af5
34 files changed:
frontend/README.html
frontend/nbproject/build-impl.xml
frontend/nbproject/genfiles.properties
frontend/nbproject/project.properties
frontend/src/saccubus/ConvertingSetting.java [deleted file]
frontend/src/saccubus/MainFrame.java
frontend/src/saccubus/OptionValue.java [deleted file]
frontend/src/saccubus/converter/Converter.java [moved from frontend/src/saccubus/Converter.java with 65% similarity]
frontend/src/saccubus/converter/FfmpegOption.java [new file with mode: 0644]
frontend/src/saccubus/converter/FileSetting.java [new file with mode: 0644]
frontend/src/saccubus/converter/Profile.java [new file with mode: 0644]
frontend/src/saccubus/converter/Proxy.java [new file with mode: 0644]
frontend/src/saccubus/converter/SFile.java [new file with mode: 0644]
frontend/src/saccubus/converter/filegetter/CommentFileWebGetter.java [moved from frontend/src/saccubus/filegetter/CommentFileWebGetter.java with 83% similarity]
frontend/src/saccubus/converter/filegetter/FileGetter.java [moved from frontend/src/saccubus/filegetter/FileGetter.java with 89% similarity]
frontend/src/saccubus/converter/filegetter/FileInstanciator.java [moved from frontend/src/saccubus/filegetter/FileInstanciator.java with 71% similarity]
frontend/src/saccubus/converter/filegetter/FileLocator.java [new file with mode: 0644]
frontend/src/saccubus/converter/filegetter/LoginInfo.java [moved from frontend/src/saccubus/filegetter/LoginInfo.java with 51% similarity]
frontend/src/saccubus/converter/filegetter/TcommFileWebGetter.java [moved from frontend/src/saccubus/filegetter/TcommFileWebGetter.java with 95% similarity]
frontend/src/saccubus/converter/filegetter/VideoFileWebGetter.java [moved from frontend/src/saccubus/filegetter/VideoFileWebGetter.java with 94% similarity]
frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java [moved from frontend/src/saccubus/filegetter/WebFileInstanciator.java with 63% similarity]
frontend/src/saccubus/filegetter/FileLocator.java [deleted file]
frontend/src/saccubus/filegetter/VideoFileLocator.java [deleted file]
frontend/src/saccubus/prompt/Prompt.java
frontend/src/saccubus/properties/BasicSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/ConvertSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/InputCommentSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/InputFileSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/InputTcommentSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/InputVideoSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/MovieSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/OutputVideoSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/ProcessFileSetting.java [new file with mode: 0644]
frontend/src/saccubus/properties/SProperties.java [new file with mode: 0644]