Merge origin/master

Conflicts:
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
This commit is contained in:
Jindra Petřík
2014-11-05 18:31:58 +01:00
57 changed files with 925 additions and 594 deletions

View File

@@ -292,6 +292,7 @@ public class IdentifiersDeobfuscation {
/**
* Ensures identifier is valid and if not, uses paragraph syntax
*
* @param as3 Is ActionScript3
* @param s Identifier
* @param validExceptions Exceptions which are valid (e.g. some reserved
* words)