empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts from VS2013,VS2015 vcxproj.filters files

Browse source
This commit is contained in:
tomcw 2016-09-06 16:57:44 +01:00
parent 20ed6607e5
commit f2316604ad
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,6 +6,7 @@
*.user
*.sln.docstates
*.VC.opendb
*.VC.db
# Build results
[Dd]ebug/

12
AppleWinExpress2013.vcxproj.filters
View file

@ -429,12 +429,12 @@
<ClInclude Include="source\DiskDefs.h">
<Filter>Source Files\Disk</Filter>
</ClInclude>
<<<<<<< HEAD
=======
<ClInclude Include="source\NTSC.h">
<Filter>Source Files\Video</Filter>
</ClInclude>
>>>>>>> NTSC_PreMerge
<ClInclude Include="source\NTSC_CharSet.h">
<Filter>Source Files\Video</Filter>
</ClInclude>
<ClInclude Include="source\Pravets.h">
<Filter>Source Files\Model</Filter>
</ClInclude>
@ -450,12 +450,6 @@
<ClInclude Include="source\SaveState_Structs_v1.h">
<Filter>Source Files\_Headers</Filter>
</ClInclude>
<<<<<<< HEAD
=======
<ClInclude Include="source\NTSC_CharSet.h">
<Filter>Source Files\Video</Filter>
</ClInclude>
>>>>>>> NTSC_PreMerge
</ItemGroup>
<ItemGroup>
<Image Include="resource\Applewin.bmp">

12
AppleWinExpress2015.vcxproj.filters
View file

@ -429,12 +429,12 @@
<ClInclude Include="source\DiskDefs.h">
<Filter>Source Files\Disk</Filter>
</ClInclude>
<<<<<<< HEAD
=======
<ClInclude Include="source\NTSC.h">
<Filter>Source Files\Video</Filter>
</ClInclude>
>>>>>>> NTSC_PreMerge
<ClInclude Include="source\NTSC_CharSet.h">
<Filter>Source Files\Video</Filter>
</ClInclude>
<ClInclude Include="source\Pravets.h">
<Filter>Source Files\Model</Filter>
</ClInclude>
@ -450,12 +450,6 @@
<ClInclude Include="source\SaveState_Structs_v1.h">
<Filter>Source Files\_Headers</Filter>
</ClInclude>
<<<<<<< HEAD
=======
<ClInclude Include="source\NTSC_CharSet.h">
<Filter>Source Files\Video</Filter>
</ClInclude>
>>>>>>> NTSC_PreMerge
</ItemGroup>
<ItemGroup>
<Image Include="resource\Applewin.bmp">