diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-16 18:55:19 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-16 18:55:19 -0700 |
| commit | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (patch) | |
| tree | f870c3c5c4f65fc3d7e22b3b37fb96ad6eb821f9 /.gitignore | |
| parent | d0935f667fd809a32cb4184a2c422ff79dc6d933 (diff) | |
| parent | 69ceb7e730a1fe4e2d0f82c7d29875bd796468ea (diff) | |
| download | infinitytier-9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60.tar.gz infinitytier-9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -52,3 +52,4 @@ java/build_win32/ /ui/.module-cache /windows/WebUIWrapper/bin /windows/WebUIWrapper/obj +node_modules |