OSDN Git Service

Merge branch 'master'
authoryukihane <yukihane.feather@gmail.com>
Fri, 19 Aug 2011 20:19:39 +0000 (05:19 +0900)
committeryukihane <yukihane.feather@gmail.com>
Fri, 19 Aug 2011 20:19:39 +0000 (05:19 +0900)
commitea79f0bff9f1a85d1f2b4abfe9bc499e14552fe7
tree25524ba48110675b9486efe5ed7afad1705b33e7
parent37e5cc1b8637ddc0db59bee188c7c12393b3b903
parent9714e6d1abea345cfc16604efbd254317b39c59d
Merge branch 'master'

Conflicts:
frontend/src/saccubus/converter/Converter.java
frontend/src/saccubus/converter/filegetter/FileInstanciator.java
frontend/src/saccubus/MainFrame.java
frontend/src/saccubus/converter/Converter.java
frontend/src/saccubus/converter/classic/profile/CommentGetInfo.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/properties/SProperties.java
frontend/src/yukihane/saccubus/converter/profile/CommentGetInfo.java