diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-02-24 15:45:52 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-02-24 15:49:36 +0100 |
| commit | 3c7d5a1f6c188eed12275ff6884a6d8fd1669ffd (patch) | |
| tree | 5b72ec229f01b3cccf52935a3c9eb7998addced6 /xserver/doc | |
| parent | bf92adb413c678cf9583c52c3ba70eb470aa5164 (diff) | |
Merge server-1.13.3rc1 branch from X.Org.
up to e604b19fc54fee839bbe2d66930b36108ff03950
Diffstat (limited to 'xserver/doc')
| -rw-r--r-- | xserver/doc/Makefile.in | 2 | ||||
| -rw-r--r-- | xserver/doc/dtrace/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in index 2b2144220..1d60e98f2 100644 --- a/xserver/doc/Makefile.in +++ b/xserver/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/xserver/doc/dtrace/Makefile.in b/xserver/doc/dtrace/Makefile.in index 3eccdc647..094ee851a 100644 --- a/xserver/doc/dtrace/Makefile.in +++ b/xserver/doc/dtrace/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. |