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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index fd65d86..aa4996b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign -SUBDIRS = src man +SUBDIRS = src man compat EXTRA_DIST = README.NV1 README.G80 ChangeLog |