mirror of https://github.com/OpenRCT2/OpenRCT2.git
master project files
This commit is contained in:
parent
e6e3fce74d
commit
6eb635fd2b
|
@ -98,11 +98,7 @@
|
||||||
<ClCompile Include="..\src\window_ride_construction.c" />
|
<ClCompile Include="..\src\window_ride_construction.c" />
|
||||||
<ClCompile Include="..\src\window_ride_list.c" />
|
<ClCompile Include="..\src\window_ride_list.c" />
|
||||||
<ClCompile Include="..\src\window_save_prompt.c" />
|
<ClCompile Include="..\src\window_save_prompt.c" />
|
||||||
<<<<<<< HEAD
|
|
||||||
<ClCompile Include="..\src\window_staff.c" />
|
<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_exit.c" />
|
||||||
<ClCompile Include="..\src\window_title_logo.c" />
|
<ClCompile Include="..\src\window_title_logo.c" />
|
||||||
<ClCompile Include="..\src\window_main.c" />
|
<ClCompile Include="..\src\window_main.c" />
|
||||||
|
|
|
@ -281,7 +281,6 @@
|
||||||
<ClCompile Include="..\src\finance.c">
|
<ClCompile Include="..\src\finance.c">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<<<<<<< HEAD
|
|
||||||
<ClCompile Include="..\src\window_ride_construction.c">
|
<ClCompile Include="..\src\window_ride_construction.c">
|
||||||
<Filter>Windows</Filter>
|
<Filter>Windows</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
@ -289,9 +288,6 @@
|
||||||
<Filter>Windows</Filter>
|
<Filter>Windows</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\src\window_staff.c">
|
<ClCompile Include="..\src\window_staff.c">
|
||||||
=======
|
|
||||||
<ClCompile Include="..\src\window_banner.c">
|
|
||||||
>>>>>>> 1eda151c704278e17de7b0ee88849342706b2bbc
|
|
||||||
<Filter>Windows</Filter>
|
<Filter>Windows</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
Loading…
Reference in New Issue