Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source

# Conflicts:
#	src/challenges/challenge_data.cpp

...

This commit is contained in:

auria.mg

2016-07-30 20:53:37 -04:00

parent 40ab343922 788f168c7f

commit 9a740311bf

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