Matthias Lanzinger 9bb7edd14e Merge branch 'master' into update_objective ...

Conflicts:
	src/window_game_bottom_toolbar.c

2014-05-01 22:39:05 +02:00

..

openrct2.sln

initial commit

2014-04-02 00:31:55 +01:00

openrct2.vcxproj

Changed screenshot format from BMP to PNG (using LodePNG)

2014-05-01 19:10:07 +02:00

openrct2.vcxproj.filters

Changed screenshot format from BMP to PNG (using LodePNG)

2014-05-01 19:10:07 +02:00

openrct2.vcxproj.user

Merge branch 'master' into update_objective

2014-05-01 22:39:05 +02:00

resource.h

add intro screen code

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