miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
This commit is contained in:
Sergii Pylypenko
2014-08-19 19:21:47 +03:00
parent 9916f1e361 f1273275cc
commit 2603e6b5e3
115 changed files with 4741 additions and 2376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source.list
View File

@@ -303,6 +303,7 @@ road_internal.h
road_type.h
roadstop_base.h
roadveh.h
safeguards.h
screenshot.h
sdl.h
sound/sdl_s.h