diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
| commit | 6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (patch) | |
| tree | fd434665398565d3bb9c68b97c978b63a7756add /libX11 | |
| parent | d8f61fbb152bca029b56b117c679b03b6a72b467 (diff) | |
| parent | 30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (diff) | |
| download | vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.gz vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.bz2 vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 1 | ||||
| -rw-r--r-- | libX11/specs/Makefile.am | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index baff95fd4..dfe112a6b 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -469,6 +469,7 @@ AC_OUTPUT([Makefile specs/i18n/trans/Makefile
specs/libX11/Makefile
specs/XIM/Makefile
+ specs/XKB/Makefile
x11.pc
x11-xcb.pc])
diff --git a/libX11/specs/Makefile.am b/libX11/specs/Makefile.am index e2ff4117e..697de5dda 100644 --- a/libX11/specs/Makefile.am +++ b/libX11/specs/Makefile.am @@ -21,4 +21,4 @@ # DEALINGS IN THE SOFTWARE.
#
-SUBDIRS=libX11 i18n XIM
+SUBDIRS=libX11 i18n XIM XKB
|