diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-07-19 12:31:36 -0400 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-07-19 12:31:36 -0400 |
| commit | 76a316d0cec92a04c8735926a76e76c21f960d7e (patch) | |
| tree | 75bcc64b3af49c4d7bff3ac28605d7567d76da8c /src/Makefile.am | |
| parent | 433cb6ba82698676f6f72e09834aba4d64611d54 (diff) | |
| parent | 84805167ab8a422966355b9753bfcb4dad802413 (diff) | |
Merge branch 'master' into exa
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9c2a5c21..c2e49ac3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,6 +58,7 @@ i810_drv_la_SOURCES = \ i830_3d.c \ i830_reg.h \ i915_3d.c \ + i915_3d.h \ i915_reg.h \ i830_exa.c \ i830_xaa.c \ |