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

Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 

Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
This commit is contained in:
ddevrien 2014-05-09 10:12:05 +02:00
parent 3eff5ebf6f 1eda151c70
commit e6e3fce74d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openrct2.vcxproj
View File

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