diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-10-21 17:35:38 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-10-21 17:35:38 -0700 |
| commit | 6471c1f4e26c0230b40bf0102a52493aa78236b9 (patch) | |
| tree | b8791931f4d4f6becbbab794f2a0d95d9363054d /.gitignore | |
| parent | 21ae423feb0e63cdbdd47be921e257c1d59de27a (diff) | |
| parent | a46514b397acdf42451d41398ef77eec60744256 (diff) | |
| download | infinitytier-6471c1f4e26c0230b40bf0102a52493aa78236b9.tar.gz infinitytier-6471c1f4e26c0230b40bf0102a52493aa78236b9.zip | |
Merge branch 'adamierymenko-dev' into windows-ui
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -49,23 +49,17 @@ Thumbs.db *.rpm *.autosave *.tmp +node_modules -# Root topology build files, temporaries, and never check in secrets -/root-topology/bin2c -/root-topology/mktopology -/root-topology/*.secret -/root-topology/test/supernodes -/root-topology/test/test-root-topology +# cluster-geo stuff +cluster-geo/cluster-geo/config.js +cluster-geo/cluster-geo/cache.* # MacGap wrapper build files /ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* /ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/xcuserdata/* /ext/mac-ui-macgap1-wrapper/src/build -# Web UI dev temporaries -/ui/.module-cache -node_modules - # Java/Android/JNI build droppings java/obj/ java/libs/ |