Robert Jordan 41171aa304 Resolved Merge Conflicts

2015-05-30 16:00:13 -04:00

..

language

fix output project directories

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

libs

Progress on window colour schemes

2015-05-26 16:59:25 -04:00

openrct2.sln

Separate external libraries and language files into VS projects

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

openrct2.vcxproj

Starting work on colour schemes config settings

2015-05-29 12:04:53 -04:00

openrct2.vcxproj.filters

Progress on window colour schemes

2015-05-26 16:59:25 -04:00

openrct2.vcxproj.user

Fix rotation disapearing sprites

2015-05-30 10:15:29 +01:00

resource.h

add intro screen code

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