From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- libX11/specs/.gitignore | 5 ++++ libX11/specs/Makefile.am | 48 ++++++++++++++++++------------------ libX11/specs/i18n/compose/.gitignore | 2 ++ libX11/specs/libX11/CH04.xml | 3 ++- 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 libX11/specs/.gitignore create mode 100644 libX11/specs/i18n/compose/.gitignore (limited to 'libX11/specs') diff --git a/libX11/specs/.gitignore b/libX11/specs/.gitignore new file mode 100644 index 000000000..92946c9f0 --- /dev/null +++ b/libX11/specs/.gitignore @@ -0,0 +1,5 @@ +*.html +*.ps +*.pdf +*.txt +*.db diff --git a/libX11/specs/Makefile.am b/libX11/specs/Makefile.am index 697de5dda..6d49014a7 100644 --- a/libX11/specs/Makefile.am +++ b/libX11/specs/Makefile.am @@ -1,24 +1,24 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -SUBDIRS=libX11 i18n XIM XKB +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +SUBDIRS=libX11 i18n XIM XKB diff --git a/libX11/specs/i18n/compose/.gitignore b/libX11/specs/i18n/compose/.gitignore new file mode 100644 index 000000000..c8f2485b0 --- /dev/null +++ b/libX11/specs/i18n/compose/.gitignore @@ -0,0 +1,2 @@ +# Generated DocBook XML from a perl script +*.xml diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml index 9cdfd1a7f..388a6801c 100644 --- a/libX11/specs/libX11/CH04.xml +++ b/libX11/specs/libX11/CH04.xml @@ -2388,7 +2388,8 @@ To request conversion of a selection, use XConvertSelection Display *display - Atomselection, target + Atom selection + Atom target Atom property Window requestor Time time -- cgit v1.2.3