aboutsummaryrefslogtreecommitdiff
path: root/libX11/specs/XIM/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-19 10:32:31 +0000
committermarha <marha@users.sourceforge.net>2010-05-19 10:32:31 +0000
commitb16c0295c9f95426980d567e93ae00c52545b3fa (patch)
treed25e3271be998e47e0ff07048d8297001409ea5f /libX11/specs/XIM/Makefile.am
parentc1b8f2475ebdeb148f4a27b78ed3cb24c68a92c4 (diff)
parent153f5cafa19da4e4c0cf21e9c909958359ed8ebd (diff)
downloadvcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.gz
vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.bz2
vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.zip
svn merge "^/branches/released" .
Diffstat (limited to 'libX11/specs/XIM/Makefile.am')
-rw-r--r--libX11/specs/XIM/Makefile.am58
1 files changed, 28 insertions, 30 deletions
diff --git a/libX11/specs/XIM/Makefile.am b/libX11/specs/XIM/Makefile.am
index 89806bdcb..b9bb42fec 100644
--- a/libX11/specs/XIM/Makefile.am
+++ b/libX11/specs/XIM/Makefile.am
@@ -1,30 +1,28 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. 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.
-#
-
-# Based on xc/doc/specs/XIM/Makefile from X11R6.9
-
-doc_sources = xim.ms
-
-include $(top_srcdir)/specs/troffrules.in
-
-
+#
+# Copyright 2009 Sun Microsystems, Inc. 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.
+#
+
+# Based on xc/doc/specs/XIM/Makefile from X11R6.9
+
+doc_sources = xim.ms
+
+include $(top_srcdir)/specs/troffrules.in