IntelOrca 647d9a42a5 Merge branch 'develop' into random-map ...

Conflicts:
	projects/openrct2.vcxproj.user

2015-02-09 14:30:41 +00:00

..

language

fix output project directories

2014-12-20 13:13:08 +00:00

libs

fix output project directories

2014-12-20 13:13:08 +00:00

openrct2.sln

Separate external libraries and language files into VS projects

2014-12-18 22:31:16 +01:00

openrct2.vcxproj

fix errors

2015-02-08 03:19:24 +00:00

openrct2.vcxproj.filters

fix errors

2015-02-08 03:19:24 +00:00

openrct2.vcxproj.user

Merge branch 'develop' into random-map

2015-02-09 14:30:41 +00:00

resource.h

add intro screen code

2014-04-02 16:46:58 +01:00