LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-28 10:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6'

Browse Source 
Conflicts:
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/SymbolType.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/InstanceInfo.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionGraph.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphSourceItem.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
	libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
	libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
	src/com/jpexs/decompiler/flash/gui/Main.java
	src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java
This commit is contained in:
Jindra Petřík
2015-07-03 19:06:09 +02:00
parent 0cea275073 ab5e79632b
commit 626668fc43
150 changed files with 8061 additions and 6047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
View File

@@ -143,8 +143,13 @@ public class Helper {
}
/**
* <<<<<<< HEAD
* Formats specified address to four numbers xxxx (or five numbers when
* showing decimal addresses)
* =======
* Formats specified address to four numbers xxxx
* (or five numbers when showing decimal addresses)
* >>>>>>> v6
*
* @param number Address to format
* @return String representation of the address
@@ -154,8 +159,13 @@ public class Helper {
}
/**
* <<<<<<< HEAD
* Formats specified address to four numbers xxxx (or five numbers when
* showing decimal addresses)
* =======
* Formats specified address to four numbers xxxx
* (or five numbers when showing decimal addresses)
* >>>>>>> v6
*
* @param number Address to format
* @param decimal Use decimal format
@@ -282,7 +292,12 @@ public class Helper {
* character.</li>
* </ul>
*
* <<<<<<< HEAD
*
* @param st A string optionally containing standard java escape sequences.
* =======
* @param st A string optionally containing standard java escape sequences.
* >>>>>>> v6
* @return The translated string.
*/
public static String unescapeJavaString(String st) {
@@ -1347,4 +1362,5 @@ public class Helper {
}
return data;
}
}