Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-28 11:33:53 +00:00
Code Issues Projects Releases Wiki Activity

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 *.user
*.sln.docstates *.sln.docstates
*.VC.opendb *.VC.opendb
*.VC.db
# Build results # Build results
[Dd]ebug/ [Dd]ebug/

12
AppleWinExpress2013.vcxproj.filters
View File

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

12
AppleWinExpress2015.vcxproj.filters
View File

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