diff options
author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-24 15:43:48 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-24 15:43:48 -0700 |
commit | c6e4105ce40ef053e026cc0ffe4925ab568ea700 (patch) | |
tree | fc0dc085da1e894a95ae8fddd6d06e4703d143ad /src/g80_dma.h | |
parent | 5d9b75b432dbc525e10c1c00436a1820456f6fb4 (diff) | |
parent | 4ff648c85f8aa90b343b7e2df176c0511b3cdaa5 (diff) |
Merge branch 'randr-1.2'
Conflicts:
configure.ac
man/Makefile.am
man/nv.man
src/g80_display.h
src/g80_output.c
src/nv_driver.c
Diffstat (limited to 'src/g80_dma.h')
0 files changed, 0 insertions, 0 deletions