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

..

audio.c

Fixed extern and enum name usage

2015-12-16 14:48:27 -06:00

audio.h

Clean up the comments a litte

2015-12-11 16:19:46 -06:00

mixer.cpp

Merge branch 'develop' into vehicle-update

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

mixer.h

countof with type safety

2015-12-15 00:28:58 +01:00