Michał Janiszewski e666a24c82 Merge branch 'develop' into vehicle-update ...

Conflicts:
	projects/openrct2.vcxproj.filters
	src/audio/mixer.cpp
	src/windows/ride.c

2015-12-22 14:57:40 +01:00

..

language

fix msbuild XP configration mistake for language project

2015-10-21 21:09:39 +01:00

libs

add XP msbuild configuration

2015-10-21 21:02:15 +01:00

openrct2.sln

fix msbuild XP configration mistake for language project

2015-10-21 21:09:39 +01:00

openrct2.vcxproj

Merge branch 'develop' into vehicle-update

2015-12-22 14:57:40 +01:00

openrct2.vcxproj.filters

Merge branch 'develop' into vehicle-update

2015-12-22 14:57:40 +01:00

openrct2.vcxproj.user

Add remaining track types to acceleration function

2015-12-13 15:33:01 +00:00

resource.h

Strip all whitespace

2015-10-20 20:48:51 +02:00