| OLD | NEW |
|---|
| 1 # | 1 # |
| 2 # NOTE! Please use 'git ls-files -i --exclude-standard' | 2 # NOTE! Please use 'git ls-files -i --exclude-standard' |
| 3 # command after changing this file, to see if there are | 3 # command after changing this file, to see if there are |
| 4 # any tracked files which get ignored after the change. | 4 # any tracked files which get ignored after the change. |
| 5 # | 5 # |
| 6 | 6 |
| 7 # Standard ignores | 7 # Standard ignores |
| 8 *.[aod] | 8 *.[aod] |
| 9 *.la | 9 *.la |
| 10 *.lo | 10 *.lo |
| 11 *.pyc | 11 *.pyc |
| 12 *.so | 12 *.so |
| 13 *~ | 13 *~ |
| 14 | 14 |
| 15 # Anything created as a result of running a test | 15 # Anything created as a result of running a test |
| 16 results.*/ | 16 results.*/ |
| 17 tmp/ | 17 tmp/ |
| 18 | 18 |
| 19 # This file is meant only for local testing | 19 # This file is meant only for local testing |
| 20 private_host_attributes_config.py | 20 private_host_attributes_config.py |
| 21 | 21 |
| 22 # default svn:ignore property: | 22 # default svn:ignore property: |
| 23 *.o |
| 24 #*# |
| 23 .*.rej | 25 .*.rej |
| 24 *.rej | 26 *.rej |
| 25 .*~ | 27 .*~ |
| 26 *~ | 28 *~ |
| 27 .#* | 29 .#* |
| 28 .DS_Store. | 30 .DS_Store. |
| 29 # additional patterns: | 31 # additional patterns: |
| 32 *.pyc |
| 30 client/control | 33 client/control |
| 31 client/results/ | 34 client/results/ |
| 32 client/tests/kvm/images | 35 client/tests/kvm/images |
| 33 client/tests/kvm/env | 36 client/tests/kvm/env |
| 34 client/tmp | 37 client/tmp |
| 35 client/tests/kvm/*.cfg | 38 client/tests/kvm/*.cfg |
| 39 server/tmp |
| 40 tko/parsers/test/site_scenarios |
| 41 ExternalSource |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6246035:
Merge remote branch 'cros/upstream' into master (Closed)
Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master