diff options
| author | Dave Parker <dparker@chromium.org> | 2012-02-09 13:39:00 -0800 |
|---|---|---|
| committer | Dave Parker <dparker@chromium.org> | 2012-02-09 13:39:00 -0800 |
| commit | 7c01418f9c0a9c9a01bdb25d9c4a5884ec157501 (patch) | |
| tree | 224011b767001cad8b095b11424fbe9b5b793442 /.gitignore | |
| parent | e11243c9a2bf23e94dfe74658c525b14e644854e (diff) | |
| parent | e42cd379ded4f31487b863d84db11c8c24e22a76 (diff) | |
| download | chrome-ec-7c01418f9c0a9c9a01bdb25d9c4a5884ec157501.tar.gz | |
Merge development work from private blizzard.git repo.
BUG=chrome-os-partner:7564
TEST=None
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 0aa56f6908..440fd12fdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -board/*/ build/ -vendor/ +*.map +*.bin +*.elf +*.swp +*.pyc |