Merge origin/master

Conflicts:
	src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
This commit is contained in:
Jindra Petřík
2014-11-07 22:18:53 +01:00
61 changed files with 954 additions and 120 deletions

View File

@@ -2610,6 +2610,11 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
return new RECT(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE);
}
@Override
public int hashCode() {
return tag.hashCode();
}
};
}
}