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

Browse Source

# Conflicts:
#	src/scriptengine/script_engine.cpp

...

This commit is contained in:

auria.mg 2017-01-19 21:04:35 -05:00

parent 52fff152de ef82257110

commit a0499fcfd6

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

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

Diff Content Not Available