Merge branch 'update_objective' of github.com:lnz/OpenRCT2 into update_objective

Browse Source

Conflicts:
	src/news_item.c
	src/news_item.h
	src/peep.h
	src/scenario.c

...

This commit is contained in:

Matthias Lanzinger

2014-05-03 15:04:22 +02:00

parent 72adb4d8bf fcd3daec57

commit 3d0e800c70

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available