diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
| commit | f586b49ae23c573681b939ca44b3f418c83c84b2 (patch) | |
| tree | ffafe2da4517c5121ab4a8c64966e72829147215 /xorg-server/xkeyboard-config/geometry/Makefile.am | |
| parent | 728ff03357b2dfd7048ab093183a239a0ba044c4 (diff) | |
| parent | 3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626 (diff) | |
| download | vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.gz vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.bz2 vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.zip | |
svn merge "^/branches/released" .
Solved mouse motion bug in new version of dix/getevents.c
Diffstat (limited to 'xorg-server/xkeyboard-config/geometry/Makefile.am')
| -rw-r--r-- | xorg-server/xkeyboard-config/geometry/Makefile.am | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xorg-server/xkeyboard-config/geometry/Makefile.am b/xorg-server/xkeyboard-config/geometry/Makefile.am index 84619fb96..7c9e395fa 100644 --- a/xorg-server/xkeyboard-config/geometry/Makefile.am +++ b/xorg-server/xkeyboard-config/geometry/Makefile.am @@ -1,15 +1,15 @@ -SUBDIRS = digital_vndr sgi_vndr - -geomdir = $(xkb_base)/geometry - -dist_geom_DATA = \ -amiga ataritt chicony \ -dell everex fujitsu \ -hhk hp keytronic kinesis \ -macintosh microsoft nec nokia \ -northgate pc sony thinkpad \ -sun typematrix winbook README - -dir_data = $(dist_geom_DATA) - -include $(top_srcdir)/xkbrules.am +SUBDIRS = digital_vndr sgi_vndr
+
+geomdir = $(xkb_base)/geometry
+
+dist_geom_DATA = \
+amiga ataritt chicony \
+dell everex fujitsu \
+hhk hp keytronic kinesis \
+macintosh microsoft nec nokia \
+northgate pc sanwa sony thinkpad \
+sun typematrix winbook README
+
+dir_data = $(dist_geom_DATA)
+
+include $(top_srcdir)/xkbrules.am
|