diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /scripts/.gitignore | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'scripts/.gitignore')
| -rw-r--r-- | scripts/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index c5d5db54c009..105b21f08185 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore | |||
| @@ -7,3 +7,5 @@ pnmtologo | |||
| 7 | bin2c | 7 | bin2c |
| 8 | unifdef | 8 | unifdef |
| 9 | ihex2fw | 9 | ihex2fw |
| 10 | recordmcount | ||
| 11 | docproc | ||