OSDN Git Service

Merge branch 'master'
authoryukihane <yukihane.feather@gmail.com>
Tue, 16 Aug 2011 18:20:24 +0000 (03:20 +0900)
committeryukihane <yukihane.feather@gmail.com>
Tue, 16 Aug 2011 18:20:24 +0000 (03:20 +0900)
commitd92a74d16850cb2c068948a0fd33bce2ac2714b5
treec6531451229940087b935420480f46a01eb5596c
parent522c99911ffeba611087c9cc93e44ce461246e8f
parent867e1638e4fa2c03dbc974264f1f9f7ef17ff066
Merge branch 'master'

Conflicts:
frontend/nbproject/project.properties
frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
frontend/nbproject/project.properties
frontend/src/saccubus/MainFrame.java
frontend/src/saccubus/SavePanel.java
frontend/src/saccubus/converter/FfmpegCommand.java
frontend/src/saccubus/converter/filegetter/CommentFileWebGetter.java
frontend/src/saccubus/converter/filegetter/FileInstanciator.java
frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
frontend/src/saccubus/net/VideoInfo.java
frontend/src/yukihane/nicovideo/NicoDBFinder.java