diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-28 14:35:11 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-28 14:35:11 +0930 |
| commit | d68d321c0692848dd5eb67a3713676498c1c646b (patch) | |
| tree | 5863ae7337d24ad2a628dc6e6e4cba88641a9dad /man | |
| parent | 7d0977bc02ce4f29c0ed335fcdcce4ed7c328259 (diff) | |
| parent | 3e99cc281509c70c9240e71ae55cf4e62c6569ba (diff) | |
Merge branch 'master' into mpx
Conflicts:
.gitignore
man/XGrabDeviceKey.man
man/XListInputDevices.man
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 4d4eb0a..80e5e64 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # |