Merge origin/master

This commit is contained in:
Jindra Petřík
2015-10-24 10:11:38 +02:00
135 changed files with 518 additions and 308 deletions
@@ -1200,9 +1200,6 @@ public class Main {
public static void main(String[] args) throws IOException {
clearTemp();
//String pluginPath = Configuration.pluginPath.get();
//if (pluginPath != null && !pluginPath.isEmpty()) {
//}
try {
SWFDecompilerPlugin.loadPlugins();