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

Merge branch 'master' of https://github.com/stella-emu/stella 

# Conflicts:
#	src/windows/Stella.vcxproj.filters
This commit is contained in:
thrust26 2017-10-08 18:52:38 +02:00
parent 20babc832a 5f2e383440
commit a9910f2649
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/windows/Stella.vcxproj
View File

@ -503,6 +503,7 @@
<ClInclude Include="..\common\FrameBufferSDL2.hxx" />
<ClInclude Include="..\common\FSNodeFactory.hxx" />
<ClInclude Include="..\common\FSNodeZIP.hxx" />
<ClInclude Include="..\common\LinkedObjectPool.hxx" />
<ClInclude Include="..\common\MediaFactory.hxx" />
<ClInclude Include="..\common\MouseControl.hxx" />
<ClInclude Include="..\common\RewindManager.hxx" />
@ -639,7 +640,6 @@
<ClInclude Include="..\common\SoundSDL2.hxx" />
<ClInclude Include="..\common\Stack.hxx" />
<ClInclude Include="..\common\Version.hxx" />
<ClInclude Include="..\common\VideoModeList.hxx" />
<ClInclude Include="..\emucore\AtariVox.hxx" />
<ClInclude Include="..\emucore\Booster.hxx" />
<ClInclude Include="..\emucore\Cart.hxx" />
@ -772,7 +772,6 @@
<ClInclude Include="..\gui\RomAuditDialog.hxx" />
<ClInclude Include="..\gui\RomInfoWidget.hxx" />
<ClInclude Include="..\gui\ScrollBarWidget.hxx" />
<ClInclude Include="..\gui\Stack.hxx" />
<ClInclude Include="..\gui\StellaFont.hxx" />
<ClInclude Include="..\gui\StringListWidget.hxx" />
<ClInclude Include="..\gui\TabWidget.hxx" />
@ -793,8 +792,6 @@
<ClInclude Include="..\libpng\png.h" />
<ClInclude Include="..\libpng\pngconf.h" />
<ClInclude Include="..\libpng\pngpriv.h" />
<ClInclude Include="StateList.hxx" />
<ClInclude Include="TrakBallWidget.hxx" />
</ItemGroup>
<ItemGroup>
<None Include="stella.ico" />

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

@ -887,9 +887,6 @@
<ClInclude Include="..\common\Version.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\common\VideoModeList.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\emucore\AtariVox.hxx">
<Filter>Header Files\emucore</Filter>
</ClInclude>
@ -1286,9 +1283,6 @@
<ClInclude Include="..\gui\ScrollBarWidget.hxx">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\gui\Stack.hxx">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\gui\StellaFont.hxx">
<Filter>Header Files\gui</Filter>
</ClInclude>
@ -1730,12 +1724,6 @@
<ClInclude Include="..\common\StateManager.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="StateList.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TrakBallWidget.hxx">
<Filter>Header Files\emucore</Filter>
</ClInclude>
<ClInclude Include="..\debugger\gui\AmigaMouseWidget.hxx">
<Filter>Header Files\debugger</Filter>
</ClInclude>
@ -1754,6 +1742,9 @@
<ClInclude Include="..\debugger\TrapArray.hxx">
<Filter>Header Files\debugger</Filter>
</ClInclude>
<ClInclude Include="..\common\LinkedObjectPool.hxx">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="stella.ico">