mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

master project files

This commit is contained in:
ddevrien 2014-05-09 10:15:10 +02:00
parent e6e3fce74d
commit 6eb635fd2b
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openrct2.vcxproj
View File

@ -98,11 +98,7 @@
<ClCompile Include="..\src\window_ride_construction.c" />
<ClCompile Include="..\src\window_ride_list.c" />
<ClCompile Include="..\src\window_save_prompt.c" />
<<<<<<< HEAD
<ClCompile Include="..\src\window_staff.c" />
=======
<ClCompile Include="..\src\window_banner.c" />
>>>>>>> 1eda151c704278e17de7b0ee88849342706b2bbc
<ClCompile Include="..\src\window_title_exit.c" />
<ClCompile Include="..\src\window_title_logo.c" />
<ClCompile Include="..\src\window_main.c" />

4
projects/openrct2.vcxproj.filters
View File

@ -281,7 +281,6 @@
<ClCompile Include="..\src\finance.c">
<Filter>Source Files</Filter>
</ClCompile>
<<<<<<< HEAD
<ClCompile Include="..\src\window_ride_construction.c">
<Filter>Windows</Filter>
</ClCompile>
@ -289,9 +288,6 @@
<Filter>Windows</Filter>
</ClCompile>
<ClCompile Include="..\src\window_staff.c">
=======
<ClCompile Include="..\src\window_banner.c">
>>>>>>> 1eda151c704278e17de7b0ee88849342706b2bbc
<Filter>Windows</Filter>
</ClCompile>
</ItemGroup>