database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop-1.1' into dev-merge-up-20180202

Browse Source
This commit is contained in:
Andrew Hutchings
2018-02-02 14:53:36 +00:00
parent 5eb3bbb3f6 c792188a5f
commit 0d7c0f7ae4
77 changed files with 1371 additions and 2547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/configcpp/libconfigcpp.vcxproj
View File

@ -272,7 +272,7 @@
<ClInclude Include="configcpp.h" />
<ClInclude Include="configstream.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="versionnumber.h" />
<ClInclude Include="..\..\columnstoreversion.h" />
<ClInclude Include="writeonce.h" />
<ClInclude Include="xmlparser.h" />
</ItemGroup>
@ -300,4 +300,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

4
utils/configcpp/libconfigcpp.vcxproj.filters
View File

@ -41,7 +41,7 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="versionnumber.h">
<ClInclude Include="..\..\columnstoreversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="writeonce.h">
@ -56,4 +56,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>