mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge

Browse Source 
# Conflicts:
#	include/nana/gui/widgets/treebox.hpp
#	source/gui/place.cpp
This commit is contained in:
qPCR4vir
2019-05-05 22:15:41 +02:00
parent d6088e5d7d
commit ca96a9d3ca
8 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/vc2017/nana.vcxproj
View File

@@ -256,6 +256,7 @@
<ClInclude Include="..\..\include\nana\gui.hpp" />
<ClInclude Include="..\..\include\nana\gui\animation.hpp" />
<ClInclude Include="..\..\include\nana\gui\basis.hpp" />
<ClInclude Include="..\..\include\nana\gui\dragdrop.hpp" />
<ClInclude Include="..\..\include\nana\gui\dragger.hpp" />
<ClInclude Include="..\..\include\nana\gui\drawing.hpp" />
<ClInclude Include="..\..\include\nana\gui\effects.hpp" />

3
build/vc2017/nana.vcxproj.filters
View File

@@ -474,6 +474,9 @@
<ClInclude Include="..\..\include\nana\verbose_preprocessor.hpp">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\dragdrop.hpp">
<Filter>Include\gui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\include\nana\pop_ignore_diagnostic">