diff options
author | Eric Mellino <erme@microsoft.com> | 2016-12-15 22:23:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-15 22:23:46 +0300 |
commit | 48c8ffac66db34497c7889107a41f7ecbf2f91ae (patch) | |
tree | b5af490fd329424769d0cef71fb53c960820c2c3 /.gitignore | |
parent | f21e02e94acc52694a76b8cce42feefe186cdb2d (diff) | |
parent | 384d248e243d143c3649edc8a424a0c17fe85e02 (diff) |
Merge branch 'master' into x86-support
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index dfb06d0fe5..c21764a6f4 100644 --- a/.gitignore +++ b/.gitignore @@ -175,6 +175,7 @@ ClientBin/ node_modules/ *.metaproj *.metaproj.tmp +bin.localpkg/ # RIA/Silverlight projects Generated_Code/ |