diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-11-02 18:30:54 -0800 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-11-02 18:30:54 -0800 |
| commit | a19e82fcbc2203f0d84a0e744d344e0796bc0c33 (patch) | |
| tree | 2f8cfc56a03cf6e614991c83a309b5fce5a48e48 /.gitignore | |
| parent | 0ffcfa307e537347f181e7b22047f252d0cdc414 (diff) | |
| parent | 4e9d4304761f93a1764d3ec2d2b0c38140decad8 (diff) | |
| download | infinitytier-a19e82fcbc2203f0d84a0e744d344e0796bc0c33.tar.gz infinitytier-a19e82fcbc2203f0d84a0e744d344e0796bc0c33.zip | |
Merge branch 'edge' into windows-ui
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -34,7 +34,7 @@ Thumbs.db /world/mkworld /world/*.c25519 -# Miscellaneous file types that we don't want to check in +# Miscellaneous temporaries, build files, etc. *.log *.opensdf *.user @@ -50,10 +50,11 @@ Thumbs.db *.autosave *.tmp node_modules - -# cluster-geo stuff cluster-geo/cluster-geo/config.js cluster-geo/cluster-geo/cache.* +tests/http/zerotier-one +tests/http/result_* +tests/http/big-test-out # MacGap wrapper build files /ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* |