mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenRCT2/src/windows
History
IntelOrca 1d92e3d7ab Merge branch 'master' into reorganise-src 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	src/audio/audio.c
	src/audio/mixer.h
	src/game.c
	src/ride/vehicle.c
	src/windows/finances.c
	src/windows/research.c
 		2014-10-07 19:10:16 +01:00
..
about.c organisation: fix includes 2014-10-06 17:36:58 +01:00
banner.c organisation: fix includes 2014-10-06 17:36:58 +01:00
cheats.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
clear_scenery.c organisation: fix includes 2014-10-06 17:36:58 +01:00
dropdown.c organisation: fix includes 2014-10-06 17:36:58 +01:00
dropdown.h organisation: fix includes 2014-10-06 17:36:58 +01:00
error.c organisation: fix includes 2014-10-06 17:36:58 +01:00
error.h organisation: fix includes 2014-10-06 17:36:58 +01:00
finances.c Merge branch 'master' into reorganise-src 2014-10-07 19:10:16 +01:00
footpath.c organisation: fix includes 2014-10-06 17:36:58 +01:00
game_bottom_toolbar.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
game_top_toolbar.c organisation: fix includes 2014-10-06 17:36:58 +01:00
guest_list.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
land.c organisation: fix includes 2014-10-06 17:36:58 +01:00
main.c organisation: fix includes 2014-10-06 17:36:58 +01:00
map.c organisation: fix includes 2014-10-06 17:36:58 +01:00
music_credits.c organisation: fix includes 2014-10-06 17:36:58 +01:00
new_campaign.c organisation: fix includes 2014-10-06 17:36:58 +01:00
new_ride.c organisation: fix includes 2014-10-06 17:36:58 +01:00
news.c organisation: fix includes 2014-10-06 17:36:58 +01:00
options.c organisation: fix includes 2014-10-06 17:36:58 +01:00
park.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
peep.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
publisher_credits.c organisation: fix includes 2014-10-06 17:36:58 +01:00
research.c Merge branch 'master' into reorganise-src 2014-10-07 19:10:16 +01:00
ride.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
ride_list.c organisation: fix includes 2014-10-06 17:36:58 +01:00
save_prompt.c organisation: fix includes 2014-10-06 17:36:58 +01:00
scenery.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
scenery.h organisation: move files and update project 2014-10-06 10:21:07 +01:00
staff.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
staff_peep.c organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
title_exit.c organisation: fix includes 2014-10-06 17:36:58 +01:00
title_logo.c organisation: fix includes 2014-10-06 17:36:58 +01:00
title_menu.c organisation: fix includes 2014-10-06 17:36:58 +01:00
title_scenarioselect.c organisation: fix includes 2014-10-06 17:36:58 +01:00
tooltip.c organisation: fix includes 2014-10-06 17:36:58 +01:00
tooltip.h organisation: fix includes 2014-10-06 17:36:58 +01:00
track_list.c organisation: fix includes 2014-10-06 17:36:58 +01:00
track_manage.c organisation: fix includes 2014-10-06 17:36:58 +01:00
track_place.c organisation: fix includes 2014-10-06 17:36:58 +01:00
water.c organisation: fix includes 2014-10-06 17:36:58 +01:00