diff options
| author | Bil Bas (Spooner) <bil.bagpuss@gmail.com> | 2015-02-10 00:42:28 +0000 |
|---|---|---|
| committer | Bil Bas (Spooner) <bil.bagpuss@gmail.com> | 2015-02-10 00:42:28 +0000 |
| commit | 58d767894771cd92c018ffb164725b5d46e520b8 (patch) | |
| tree | 8af83d16aa1c3f6e217085504c0c648a7cb3a5fb /.gitignore | |
| parent | 2c1a3dfed6f9a474ace9123b46edca77be548d3e (diff) | |
| parent | f53b27dca33e00cfc5f05d3dbaf58c0f97ff28bf (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3bf450aca8..8892580de9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ tools/editor/register_exporters.cpp tools/editor/doc_data_compressed.h tools/editor/editor_icons.cpp -fpic +.fscache log.txt # Android specific |