Merge branch 'master' into confuser

This commit is contained in:
de4dot 2013-11-15 21:29:17 +01:00
commit 754b67aa00
2 changed files with 10 additions and 10 deletions

View File

@ -208,15 +208,6 @@
<Compile Include="deobfuscators\DeobUtils.cs" />
<Compile Include="deobfuscators\Dotfuscator\Deobfuscator.cs" />
<Compile Include="deobfuscators\Dotfuscator\StringDecrypter.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\DynamicDynocodeIterator.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\DynocodeService.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\DnrMethodCallInliner.cs" />
<Compile Include="deobfuscators\ILProtector\DecryptedMethodInfo.cs" />
<Compile Include="deobfuscators\ILProtector\DynamicMethodsDecrypter.cs" />
<Compile Include="deobfuscators\ILProtector\DynamicMethodsDecrypterService.cs" />
<Compile Include="deobfuscators\ILProtector\DynamicMethodsRestorer.cs" />
<Compile Include="deobfuscators\ILProtector\MethodsDecrypterBase.cs" />
<Compile Include="deobfuscators\MyPEImage.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\AntiStrongName.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\ApplicationModeDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\ApplicationModeUnpacker.cs" />
@ -231,6 +222,7 @@
<Compile Include="deobfuscators\dotNET_Reactor\v4\AssemblyResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\BooleanDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\Deobfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\DnrMethodCallInliner.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\EmptyClass.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\EncryptedResource.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\MetadataTokenObfuscator.cs" />
@ -244,6 +236,8 @@
<Compile Include="deobfuscators\Eazfuscator_NET\CodeCompilerMethodCallRestorer.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\DecrypterType.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\Deobfuscator.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\DynamicDynocodeIterator.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\DynocodeService.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\EfConstantsReader.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\EfUtils.cs" />
<Compile Include="deobfuscators\Eazfuscator_NET\ResourceMethodsRestorer.cs" />
@ -264,9 +258,14 @@
<Compile Include="deobfuscators\IDeobfuscatedFile.cs" />
<Compile Include="deobfuscators\IDeobfuscator.cs" />
<Compile Include="deobfuscators\IDeobfuscatorInfo.cs" />
<Compile Include="deobfuscators\ILProtector\DecryptedMethodInfo.cs" />
<Compile Include="deobfuscators\ILProtector\Deobfuscator.cs" />
<Compile Include="deobfuscators\ILProtector\DynamicMethodsDecrypter.cs" />
<Compile Include="deobfuscators\ILProtector\DynamicMethodsDecrypterService.cs" />
<Compile Include="deobfuscators\ILProtector\DynamicMethodsRestorer.cs" />
<Compile Include="deobfuscators\ILProtector\MainType.cs" />
<Compile Include="deobfuscators\ILProtector\MethodReader.cs" />
<Compile Include="deobfuscators\ILProtector\MethodsDecrypterBase.cs" />
<Compile Include="deobfuscators\ILProtector\StaticMethodsDecrypter.cs" />
<Compile Include="deobfuscators\InitializedDataCreator.cs" />
<Compile Include="deobfuscators\InlinedMethodsFinder.cs" />
@ -289,6 +288,7 @@
<Compile Include="deobfuscators\MethodStack.cs" />
<Compile Include="deobfuscators\MPRESS\Deobfuscator.cs" />
<Compile Include="deobfuscators\MPRESS\Lzmat.cs" />
<Compile Include="deobfuscators\MyPEImage.cs" />
<Compile Include="deobfuscators\NullStream.cs" />
<Compile Include="deobfuscators\Operations.cs" />
<Compile Include="deobfuscators\ProxyCallFixerBase.cs" />

2
dnlib

@ -1 +1 @@
Subproject commit 557af37b82fb0012b99f60157715c5e45ca5bc4b
Subproject commit bd9b249820ebb1dd561fe376316d1b070f02d3e4