diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-08 11:43:20 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-08 11:43:20 -0700 |
| commit | e5923a1240d8b32f5af080b0b4191d3b9299a630 (patch) | |
| tree | b186ab69c91eeb1be91c9f3705db82fead819728 /progs | |
| parent | 39ab5ae30c303dd561252cb592d4de35814b6a70 (diff) | |
| parent | e1762fb870f86afc4f6bd000b4a1c059d161f10d (diff) | |
Merge branch '7.8'
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/demos/.gitignore | 1 | ||||
| -rw-r--r-- | progs/demos/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/progs/demos/.gitignore b/progs/demos/.gitignore index 1b31866a85..aecdd9a011 100644 --- a/progs/demos/.gitignore +++ b/progs/demos/.gitignore @@ -1,6 +1,7 @@ arbfplight arbfslight arbocclude +arbocclude2 bounce clearspd copypix diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 5b1d2a0b65..a13a272ce9 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -15,6 +15,7 @@ PROGS = \ arbfplight \ arbfslight \ arbocclude \ + arbocclude2 \ bounce \ clearspd \ copypix \ |