-
Skylot authored
# Conflicts: # jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java # jadx-core/src/main/java/jadx/core/Jadx.java # jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java # jadx-core/src/main/java/jadx/core/dex/attributes/AType.java # jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java # jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMakerVisitor.java # jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java # jadx-core/src/test/java/jadx/tests/functional/TypeMergeTest.java # jadx-core/src/test/java/jadx/tests/integration/TestFloatValue.java # jadx-core/src/test/java/jadx/tests/integration/TestStringBuilderElimination2.java # jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java # jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java # jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays3.java # jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays4.java # jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java # jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestReturnSourceLine.java # jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java # jadx-core/src/test/java/jadx/tests/integration/inline/TestInlineInLoop.java # jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java # jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java # jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java # jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java # jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchBreak.java # jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinallyExtract.java # jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java
e1f49552
