Merge.
authorAsher Baker <asherkin@gmail.com>
Thu Aug 16 01:42:55 2012 +0100 (2012-08-16)
changeset 36109888e9ed9162
parent 3609 b64f5a211471
parent 3605 7967ac6adffc
child 3611 255a13973566
Merge.
     1.1 --- a/sourcepawn/jit/Makefile	Wed Aug 15 23:29:07 2012 +0100
     1.2 +++ b/sourcepawn/jit/Makefile	Thu Aug 16 01:42:55 2012 +0100
     1.3 @@ -19,6 +19,7 @@
     1.4  	engine2.cpp			\
     1.5  	BaseRuntime.cpp		\
     1.6  	jit_function.cpp	\
     1.7 +	md5/md5.cpp			\
     1.8  	zlib/adler32.c		\
     1.9  	zlib/compress.c		\
    1.10  	zlib/crc32.c		\
     2.1 --- a/sourcepawn/jit/msvc10/jit-x86.vcxproj	Wed Aug 15 23:29:07 2012 +0100
     2.2 +++ b/sourcepawn/jit/msvc10/jit-x86.vcxproj	Thu Aug 16 01:42:55 2012 +0100
     2.3 @@ -119,6 +119,7 @@
     2.4      <ClCompile Include="..\dll_exports.cpp" />
     2.5      <ClCompile Include="..\engine2.cpp" />
     2.6      <ClCompile Include="..\jit_function.cpp" />
     2.7 +    <ClCompile Include="..\md5\md5.cpp" />
     2.8      <ClCompile Include="..\x86\jit_x86.cpp" />
     2.9      <ClCompile Include="..\..\..\knight\shared\KeCodeAllocator.cpp" />
    2.10      <ClCompile Include="..\x86\opcode_helpers.cpp" />
    2.11 @@ -145,6 +146,7 @@
    2.12      <ClInclude Include="..\jit_function.h" />
    2.13      <ClInclude Include="..\jit_shared.h" />
    2.14      <ClInclude Include="..\jit_version.h" />
    2.15 +    <ClInclude Include="..\md5\md5.h" />
    2.16      <ClInclude Include="..\x86\jit_x86.h" />
    2.17      <ClInclude Include="..\x86\opcode_helpers.h" />
    2.18      <ClInclude Include="..\sp_vm_basecontext.h" />
     3.1 --- a/sourcepawn/jit/msvc10/jit-x86.vcxproj.filters	Wed Aug 15 23:29:07 2012 +0100
     3.2 +++ b/sourcepawn/jit/msvc10/jit-x86.vcxproj.filters	Thu Aug 16 01:42:55 2012 +0100
     3.3 @@ -19,6 +19,9 @@
     3.4      <Filter Include="zlib">
     3.5        <UniqueIdentifier>{be3a7952-1237-418c-82bb-d56f3b0f9204}</UniqueIdentifier>
     3.6      </Filter>
     3.7 +    <Filter Include="md5">
     3.8 +      <UniqueIdentifier>{a4ac4f24-40e4-481c-9bd8-42a6f5b379f0}</UniqueIdentifier>
     3.9 +    </Filter>
    3.10    </ItemGroup>
    3.11    <ItemGroup>
    3.12      <ClCompile Include="..\BaseRuntime.cpp">
    3.13 @@ -87,6 +90,9 @@
    3.14      <ClCompile Include="..\zlib\zutil.c">
    3.15        <Filter>zlib</Filter>
    3.16      </ClCompile>
    3.17 +    <ClCompile Include="..\md5\md5.cpp">
    3.18 +      <Filter>md5</Filter>
    3.19 +    </ClCompile>
    3.20    </ItemGroup>
    3.21    <ItemGroup>
    3.22      <ClInclude Include="..\BaseRuntime.h">
    3.23 @@ -137,6 +143,9 @@
    3.24      <ClInclude Include="..\..\..\public\sourcepawn\sp_vm_types.h">
    3.25        <Filter>SDK</Filter>
    3.26      </ClInclude>
    3.27 +    <ClInclude Include="..\md5\md5.h">
    3.28 +      <Filter>md5</Filter>
    3.29 +    </ClInclude>
    3.30    </ItemGroup>
    3.31    <ItemGroup>
    3.32      <ResourceCompile Include="..\version.rc">