ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge fallout.

This commit is contained in:
Christian Speckner 2018-01-29 22:25:23 +01:00
parent 89f3f4c9b8
commit 025adc59aa
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/windows/Stella.vcxproj.filters
View File

@ -888,7 +888,6 @@
<ClCompile Include="..\emucore\tia\frame-manager\YStartDetector.cxx"> <ClCompile Include="..\emucore\tia\frame-manager\YStartDetector.cxx">
<Filter>Source Files\emucore\tia</Filter> <Filter>Source Files\emucore\tia</Filter>
</ClCompile> </ClCompile>
<<<<<<< HEAD
<ClCompile Include="..\common\AudioQueue.cxx"> <ClCompile Include="..\common\AudioQueue.cxx">
<Filter>Source Files\emucore</Filter> <Filter>Source Files\emucore</Filter>
</ClCompile> </ClCompile>
@ -897,10 +896,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\emucore\tia\Audio.cxx"> <ClCompile Include="..\emucore\tia\Audio.cxx">
<Filter>Source Files\emucore\tia</Filter> <Filter>Source Files\emucore\tia</Filter>
=======
<ClCompile Include="..\gui\TimeLineWidget.cxx"> <ClCompile Include="..\gui\TimeLineWidget.cxx">
<Filter>Source Files\gui</Filter> <Filter>Source Files\gui</Filter>
>>>>>>> master
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -1831,7 +1828,6 @@
<ClInclude Include="..\emucore\tia\TIAConstants.hxx"> <ClInclude Include="..\emucore\tia\TIAConstants.hxx">
<Filter>Header Files\emucore\tia</Filter> <Filter>Header Files\emucore\tia</Filter>
</ClInclude> </ClInclude>
<<<<<<< HEAD
<ClInclude Include="..\common\AudioQueue.hxx"> <ClInclude Include="..\common\AudioQueue.hxx">
<Filter>Header Files\emucore</Filter> <Filter>Header Files\emucore</Filter>
</ClInclude> </ClInclude>
@ -1840,10 +1836,8 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\emucore\tia\Audio.hxx"> <ClInclude Include="..\emucore\tia\Audio.hxx">
<Filter>Header Files\emucore\tia</Filter> <Filter>Header Files\emucore\tia</Filter>
=======
<ClInclude Include="..\gui\TimeLineWidget.hxx"> <ClInclude Include="..\gui\TimeLineWidget.hxx">
<Filter>Header Files\gui</Filter> <Filter>Header Files\gui</Filter>
>>>>>>> master
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>