Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf

Browse Source

Conflicts:
	.gitignore

...

This commit is contained in:

Bil Bas (Spooner)

2015-02-10 00:42:28 +00:00

parent 868b14c598

commit c14230d986

1 changed files with 389 additions and 48 deletions

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

437

3d/platformer/stage.xml

File diff suppressed because one or more lines are too long