diff options
| author | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-16 23:21:39 -0300 |
|---|---|---|
| committer | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-16 23:21:39 -0300 |
| commit | a5ebb525000d8301f73377426a2c1924d70aaf86 (patch) | |
| tree | 55eaf1e0e6553dbb34d236b07a051689ae8f2493 /.gitignore | |
| parent | 553edf1f250f34ca0ef0703b13b4d601f609e491 (diff) | |
| parent | 17a90ddc0824bb51b5ea707f5d4d11aed301f91d (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# tools/editor/property_editor.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 613eff442a..6a04847f55 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,14 @@ platform/android/libs/play_licensing/gen/* *.d *.so *.os +*.Plo +*.lo +*.Po + +# Libs generated files +.deps/* +.dirstamp + # QT project files *.config @@ -282,4 +290,4 @@ cscope.in.out cscope.po.out godot.creator.* -projects/
\ No newline at end of file +projects/ |