Merge branch 'cpp-btree' into jgrpp

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	source.list
This commit is contained in:
Jonathan G Rennison
2017-02-07 22:29:44 +00:00
16 changed files with 4024 additions and 0 deletions

View File

@@ -4688,6 +4688,38 @@
>
</File>
</Filter>
<Filter
Name="Btree containers"
>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_container.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_map.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_set.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree_map.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree_set.h"
>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>